Taylor Swift, Diplo Squash Beef at 2015 Grammys After “Booty” Diss: Instagram Photo

Then this happened @taylorswift vs taylor spliff #grammys2015

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

What would Katy say!?

Taylor Swift decided to shake it off in more ways than one at the 2015 Grammys on Sunday, Feb. 8. The "Style" singer, in a surprising move, made up with Diplo after their very public four-month feud.

The DJ, who accompanied new collaborator Madonna on the red carpet, posted a friendly photo of the pair via Instagram during what appeared to be an afterparty. "Then this happened @taylorswift vs taylor spliff #grammys2015," he wrote. Diplo, 36, proudly looked up for the snapshot as Swift, 25, sipped on a drink.

The pair's disdain for each other began back in November. Following Swift's sparring with Katy Perry, Diplo — who had briefly dated the "Roar" singer — lashed out via Twitter. 

"Someone should make a kickstarter to get taylor swift a booty," Diplo wrote at the time. Swift kept quiet, but her bestie Lorde, 18, soon swooped in to defend her. She quipped back: "Should we do something about your tiny penis while we're at it hm."

More recently, Diplo said that Swift's fans were "evil" to GQ magazine last month. "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 said. "And I'm scared. I'm scared for my life."

john mayer and katy perry
John Mayer and Katy Perry attend the Hollywood Stands Up To Cancer Event on January 28, 2014 Kevin Mazur/Getty Images

Swift also was friendly with Kanye West at the Grammys. Six years ago, the rapper famously interrupted her Best Female Video acceptance speech at the 2009 Video Music Awards. The stars were photographed having fun together after West tried to do the same again during Beck's Album of the Year win Sunday night. It appeared to be a joke at first, but after Beck's win West made it clear during an interview that Beyonce should win in that category for her self-titled album.

Despite adding to her BFF list Sunday night, Swift continues to be on the outs with other entertainers. She and Perry still aren't pals, and her ex John Mayer took a swipe at her earlier this week. (Perry, 30, and Mayer, 37, have appeared to rekindle their on-and-off again romance since splitting in February 2014.) While hosting The Late Late Show on Friday, Feb. 6, Mayer quipped: "You can see me at the Grammys doing what I do best, being avoided by Taylor Swift."

Sign up now for the Us Weekly newsletter to get breaking celebrity news, hot pics and more delivered straight to your inbox!

Want stories like these delivered straight to your phone? Download the Us Weekly iPhone app now!