After squaring off on social media over Kim Kardashian, the two reportedly squashed their beef over the weekend, according to TMZ.

On Thursday (Sept. 20), Kanye called out Nick for speaking about his wife in interviews. “I understand that you used to date my wife, but you know, you get into an interview, don’t mention my wife,” Kanye said in an Instagram video.

Cannon responded by admonishing Kanye for trying to censor him. “I’ve never said anything disrespectful or harmful, in my opinion, to your marriage or your union,” he said. “I salute it, keep it going. But you not gonna tell me what I can and what I can’t say. I’m a solid individual. Somebody ask me a question, I’ma answer it to the best of my ability. I’ma give my opinion and ain’t no harm, no foul, but if it got your spirit feeling weird, holler at me.”

Following their public feud, they reportedly exchanged numbers over Instagram DM and hashed things out during a lengthy phone call, where they agreed to be respectful of each other and continue their friendship.

Their resolution may even lead to an appearance on “Wild ‘N Out.” Nick apparently discussed having Kanye back on his MTV show for the upcoming 200th episode.