The six year beef between superstar producer Calvin Harris and pop megastar Katy Perry has finally been squashed…

Their little tiffs began back in 2011 the two were set to tour together, but their professional relationship went sour when Calvin refused to open up for Katy. “Calvin Harris will NOT be joining in on the fun and has CANCELLED last minute,” she tweeted.

He quickly fired back, “Sorry to all who wanted to see me with Katy – her team suddenly moved the goalposts and I was to appear on stage with no production.”

Ever since then, they haven’t seen eye to eye, although fans have always wanted them to collaborate. Hell, even they wanted to collaborate! Finally, things have been put to rest, as Katy revealed to On Air with Ryan Seacrest

““I saw Calvin at (the) Vanity Fair Oscar party. We just bumped into each other and he said, ‘I think I have a song that you should come check out.’ We had always meant to work together for years and years and years and we’d had little falling outs here and there… we had some Twitter spats… and it was time to put that behind us. He played this one part of ‘Feels’ and I was like, ‘Oh yeah.'”

Hopefully their newfound friendship will crank out even more hits! Listen to their first collab “Feels” below!

Calvin Harris – Feels (Official Video) ft. Pharrell Williams, Katy Perry, Big Sean