Thirty-six-year-old man/DJ Diplo, who started a feud with Taylor Swift in November by tweeting that she should purchase a new derrière, has "ended" said feud, according to Us Weekly. How does Us Weekly know the feud's over? Because Diplo posted a photo of Taylor hanging out with him at the Grammy's.