Taylor Swift & Diplo End Their Feud at the Grammys 2015 - See the Photo!

Taylor Swift and Diplo put their differences aside in this photo posted to his Instagram account at the Warner Music Group’s 2015 Grammys After Party held at the Chateau Marmont on Sunday (February 8) in Los Angeles.

“Then this happened @taylorswift vs taylor spliff #grammys2015,” Diplo captioned the photo of him and the 25-year-old superstar.

Last November, Diplo tweeted a rude comment about Taylor Swift needing a booty.

Things really escalated when he gave an interview last month and dissed Taylor‘s fans!

It looks like these two squashed their beef with each other.

FYI: Taylor is wearing Christian Louboutin shoes.

See photos of both Taylor and Diplo at the party below…