Listen to Taylor Swift Radio on iHeartRadio

Taylor Swift Radio

Taylor Swift may still have "bad blood" with Katy Perry ... but it looks like any disputes between her and Kanye West, and her and Diplo are over!

If you remember (let's be honest, of course you do) Kanye West famously interrupted T-Swift's acceptance speech for Best Female Video during the 2009 VMAs -- with his "Ima let you finish" line. 

Well it looks like Kanye is over it (now having taken aim at Beck), and Tay has officially shaken it off too because the two were all smiles when they ran into each other at the Grammys this year ... even stopping to pose for pics together!

But that's not the only friendship that was mended during the Grammy Awards. It looks like Diplo won't be taking anymore shots at Taylor either. Late last year Diplo suggested a kickstarter campaign should be created to "get Taylor Swift a booty" -- a comment to which Lorde stepped in to defend her bestie from.

Well it looks like Diplo and Taylor decided to let it all go, because the producer shared a photo to his Instagram of himself and Tay sharing a drink together. He captioned the pic, "Then this happened @taylorswift vs taylor spliff #grammys2015."

Looks like Taylor's circle of famous friends just got a little bit bigger!

Then this happened @taylorswift vs taylor spliff #grammys2015

A photo posted by diplo (@diplo) on

Photos: Getty Images