Kanye West has said sorry to Wiz Khalifa after his epic rant aimed at him last week on Twitter.
He said that the two rappers had talked things through and that he'd apologised for the comments he'd made.
"Me and Wiz spoke yesterday," he told his 18 million followers. "Great convo. All positive."
Last week's argument started when Wiz appeared to suggest Kanye had stolen the idea for his new album title Waves from another artist, Max B.
Kanye West thought his wife was being brought into things when Wiz Khalifa used the initial's KK in a tweet, which Kanye assumed was about his wife Kim Kardashian.
He said he'd been mistaken when he read KK as being about his wife. , external
He also accused Wiz Khalifa of stealing tracks, making predictable music and had a pop about Amber Rose - the mother of the rapper's child and Kanye's ex-girlfriend.
Kanye West deleted most of the tweets afterwards and said he should be concentrating on finishing his new album.
Wiz Khalifa says he's now accepted Kanye West's apology but also said he went too far bringing his two-year-old son Sebastian into the rant as well as mentioning Amber Rose's former job as a stripper.
Speaking to Power 105.1 FM in New York, he said he was surprised about the Twitter row.
He was interviewed by Angie Martinez on the hip-hop radio station., external
"I think everybody was [surprised] but it's cool. Everything's cool. We spoke - it's all good," he said.
"He apologised and I accept his apology."
Wiz Khalifa's ex-wife Amber Rose also met up with Kanye West's partner Kim Kardashian "for a cup of tea" to smooth things over.
Kim Kardashian posted a picture of herself and Amber Rose on Instagram., external
The row hasn't put Kanye West off tweeting.
He's been speaking about his new album - again - saying it's "one of the greatest" albums ever rather than "the greatest".
He spoke about his idols to start with., external
He then said Waves was a pretty good album. , external
He ended by saying he wanted to make something great., external
For more stories like this one you can now download the BBC Newsbeat app straight to your device. For iOS go here, external. For Android go here, external.
