Diplo and Taylor Swift proved their feud was over with this Instagram photo. This image appears in the gallery:32 Pictures You Might Have Missed This Week (9th February 2015) 19. Diplo and Taylor Swift proved their feud was over with this Instagram photo. 'Then this happened @taylorswift vs taylor spliff #grammys2015" Picture: Instagram 32 images See the full gallery: 32 Pictures You Might Have Missed This Week (9th February 2015)