Katy Perry says music helped her to move on from her disagreements with Calvin Harris.
The two music stars had a public Twitter spat back in 2011 after Calvin cancelled his set at her gigs.
Calvin also dated Taylor Swift, who's believed to be in a long running feud with Katy.
Now Katy has told On Air With Ryan Seacrest that her collaboration with Calvin, on the hit song Feels, came about after they bumped into each other at the Vanity Fair Oscar party.
She says it was time for them to put their disputes behind them.