@diplo / Instagram 1 / 12
@diplo / Instagram 1 / 12

Taylor Swift chose the high road during Sunday night's 57th Annual GRAMMY Awards festivities. First she made amends with Kanye West and then the "Blank Space" singer squashed her beef with Diplo!

After dissing her booty and her fans, Swift still decided to put the Twitter battles of 2014 behind her and pose for a selfie with the 36-year-old DJ/music producer. "Then this happened @taylorswift vs taylor spliff #grammys2015," Diplo proudly captioned an Instagram pic of him with Swift, 25, seen sipping a drink.

Diplo -- ex flame to Swift's frenemy Katy Perry-- began the music feud when he tweeted this past November that "someone should make a kickstarter to get Taylor Swift a booty."

Swift's good friend Lorde, 18, bit back at the DJ, writing: "Should we do something about your tiny penis while we're at it?"

PHOTOS: 7 Worst Dressed Stars at the GRAMMYS

Diplo didn't just anger Swift's gal pals, but he also felt the wrath of the "Shake It Off" singer's fans. "Like, Taylor Swift fans are really crazy," he told GQ magazine. "They threatened to murder me and stuff. It's really bizarre, and disgusting. They're the worst people in the world."

He also claimed to have some dirt on the singer. "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," he added. "And I'm scared. I'm scared for my life."

While she made amends with Diplo and West, Swift still seems to be at odds with one of music's most famous on-again, off-again couples: Katy Perry and John Mayer. While hosting the Late Late Show this past week, Mayer quipped of the country crooner-turned-pop star, "You can see me at the Grammys doing what I do best, being avoided by Taylor Swift."