Katy Perry has said she's ready to put an end to the bad blood which has existed between her and Taylor Swift for the past few years.
The two music stars have been arguing ever since falling out over some backing singers three years ago.
Their feud remains unresolved, with Taylor finally putting her music on Spotify on Friday - the very same day that Katy released her new album.
But this week, Katy said: "There are bigger fish to fry, and there are real problems in the world. You know what I'm saying? I love her, and I want the best for her."
The pair are hardly the first musicians to publicly lock horns, and in an age of Twitter there are more platforms than ever for the stars to trade barbs.
Here are just a few other high-profile musical battles.
- Kanye West v Taylor Swift
Katy Perry isn't the only person to have found herself caught in a Swift storm.
Taylor's beef with Kanye West dates back to 2009 - specifically, that year's MTV Video Music Awards.
Kanye wasn't too impressed with Taylor winning video of the year for You Belong With Me.
And, let's be honest, Kanye is not the type of chap to suffer in silence.
The rapper took to the stage during Taylor's acceptance speech, grabbed the microphone, and said: "Taylor, I'm really happy for you, and I'ma let you finish, but Beyonce had one of the best videos of all time!"
He was talking about Bey's Single Ladies, which to be fair really was a masterpiece of filmmaking. But this perhaps wasn't quite the time or the place to start that debate.
The pair later made up, but a few years down the line West claimed in his single Famous that the run-in had helped Swift's career.
Taylor claimed she had never given West's lyrics her blessing, but then the rapper's wife Kim Kardashian got involved, posting a Snapchat which appeared to show Taylor doing just that.
At the 2016 Grammys, Swift responded: "I want to say to all the young women out there - there are going to be people along the way who are going to try to undercut your success or take credit for your accomplishments or your fame."
But, she advised her fans: "Just focus on the work and you don't let those people sidetrack you."
- Lil' Kim v Nicki Minaj
If a new female rapper arrives on the music scene and Lil' Kim (above left) doesn't start a fight with her - did she ever even exist?
Kim has history with Eve, Foxy Brown, Remy Ma and many more... but those were small fry compared to when Nicki Minaj appeared in the late noughties.
Nicki's debut album Pink Friday was a massive success when it was released in 2010, but Lil' Kim opted not to send flowers.
In a diss track she put out online called Black Friday, Kim described Nicki as a "Lil' Kim wannabe" who was "trying to clone my style".
Minaj, naturally, responded with a diss track of her own, called Stupid Hoe. Which drew attention to the fact that her records were "shipping platinum" while Kim remained "busted" and "crusty".
- Zayn v Naughty Boy
Zayn Malik had everything a young man could wish for at the height of One Direction's success - fame, money and worldwide adoration.
But the man responsible for 20% of the group's success left Louis, Liam, Niall and Harry behind in 2015 to pursue a solo career.
Zayn began working on some new material with Naughty Boy - the producer famous for his work with Emeli Sande and Sam Smith.
But it's fair to say that he and Zayn didn't quite hit it off in the same way.
"Naughty Boy you fat joke stop pretending we're friends no one knows you," tweeted Zayn after their recording sessions turned sour.
Mr Boy later told The Guardian the 22-year-old was "throwing his toys out of the pram" and said they had fallen out over "external influences".
Hate it when that happens.
- Azealia Banks v Iggy Azalea
The number of artists which Azealia Banks (above left) has fallen out with is so huge that it's difficult to single out just one.
But somebody who experienced a particularly high level of vitriol was Fancy singer Iggy Azalea.
For two artists who became popular around the same time and were only a couple of letters off sharing a name, perhaps comparisons and rivalries were inevitable.
It all kicked off when XXL magazine put Iggy on the cover of their annual freshman issue, which looks at the hottest newcomers in music every year.
Banks was not a massive fan of this editorial decision.
She said the magazine was "wrong" to include Iggy and went on to accuse her nemesis of appropriating black culture.
Iggy Azalea responded by saying: "You can't block my blessings, today I'm celebrating, get on with it or kick rocks."
The battle rumbled on for years, with Iggy claiming in 2014 that her huge chart success was the only reason Banks was still getting any publicity.