Grammy Feud: Taylor Swift, Diplo Reunite [PHOTOS] Katy Perry's Former BF Makes Up With '1989' Singer After Lorde Twitter Drama

While things might not be so good between Taylor Swift and Katy Perry at the moment, it looks like the "Dark Horse" singer's former boyfriend has made amends with her nemesis. During one of the Grammy award after parties Diplo and his former "punching bag" met up, and while some would think it was super awkward, it actually looks like the two enjoyed a drink together and put the harsh words behind them.

Diplo took to his Instagram account to post a selfie of him and T. Swift looking pretty chummy with one another. In the image, Tay slurps on a drink while the DJ nonchalantly stares off into the distance.

A photo posted by diplo (@diplo) on Feb 9, 2015 at 12:00am PST

"Then this happened @taylorswift vs taylor spliff #grammys2015," the star wrote as the caption to the image.

According to E! News, the star famously took to his Twitter in November to poke fun at Swift's lack of a backside.

"Someone should make a Kickstarter to get Taylor Swift a booty," the star wrote on his social media page.

Not only that but a fake Kickstarter was created with the mission to help out Taylor. "Taylor Swift Still Needs Your Help! Any true supporters of TSWIFT would definitely not pass up this opportunity to improve her posterior! Spread The World If You Believe In Magic!"

While it looks like the two have made up, no news yet on whether or not Diplo has made up with Lorde who came to Tay's defense after his harsh words. The New Zealand singer wrote, "@Diplo should we do something about your tiny penis while we're at it hm."

Maybe they can make up at the next award show after party?