So, I guess Taylor Swift and Kanye West are all cool now after their run-in at the 57th Annual Grammy Awards last night, which is pretty great. But if you thought that was the greatest Taylor Swift beef-squashing that went down at the Grammys -- like, I'm really happy for you, I'm gonna let you finish, but you've got another thing coming.

Apparently, Diplo and Taylor are all cool now, too. The "Blank Space" singer buried the hatchet with the producer at an after-party on Sunday (Feb. 8) -- or, at least buried it long enough to take a selfie together.

This beef has been squashed. Now, let's never say "beef-squashing" again.

In case you're #NotAboutTheDrama, Diplo tweeted that he wanted to "make a kickstarter to get taylor swift a booty" last November. Taylor never responded to his lame attempt at comedy (I guess she really took the message of "Shake It Off" to heart?), but thank God Lorde weighed in.