ENTERTAINMENT
02/09/2015 02:50 pm ET

Taylor Swift's Feud With Diplo Is Allegedly Over

Taylor Swift didn't end up taking home any Grammys on Sunday night, but that's okay since she was apparently busy mending fences.

If photos of Swift smiling and clasping hands with Kanye West are an indication that the two have made up, then Us Weekly is sure this Instagram snap of the singer with Diplo means their feud is so over as well:

Then this happened @taylorswift vs taylor spliff #grammys2015

A photo posted by diplo (@diplo) on


Back in November, Diplo tweeted, "Someone should make a Kickstarter to get Taylor Swift a booty." And while Swift never got her own hands dirty in this feud, Lorde, Swift's BFF, took care of things for the New York ambassador. "@diplo should we do something about your tiny penis while we're at it hm," she wrote.

The insult was the 36-year-old's way of wedging himself into then-girlfriend Katy Perry's own beef with Swift, who allegedly wrote the song "Bad Blood" about Perry. While Swift never specially said who the song was about, Perry acknowledged the feud, tweeting, "Watch out for the Regina George in sheep's clothing..."

Then in January, Diplo told GQ, "Taylor Swift is very strategic with her friends and enemies. And I know lots of secrets. I can't divulge, but I know a lot of stuff about her. And she's definitely, there's definitely scary stuff going on. And I'm scared. I'm scared for my life."

So have the two made up? Well, maybe Diplo know it's better to be in The Plastics, hating life, than to not be in at all.

HuffPost

BEFORE YOU GO

PHOTO GALLERY
Celebrity Feuds
CONVERSATIONS