Taylor Swift Makes Nice with Diplo at Grammys 2015 After Party - See the Pic!

It looks like Taylor Swift and Diplo may be ending their feud – he posted a photo to his Instagram account at the Warner Music Group’s 2015 Grammys After Party where the two appear to be totally fine!

“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‘s butt and Lorde came to her defense.

Things got pretty controversial last month when Diplo went as far as dissing Taylor‘s fan base.

It looks like these two squashed their beef with each other. See photos of both Taylor and Diplo at the party below…