Diddy says that Will Smith and Chris Rock sorted out their issues after the Best Actor winner walked on stage and slapped the comedian for a joke he told about his wife, Jada Pinkett Smith.

In a comment provided to Page Six, Diddy said there’s nothing but “love” between the two stars.

“That’s not a problem. That’s over. I can confirm that,” Diddy said. “It’s all love. They’re brothers.”

He didn’t offer up more than that, but Rock did decline to file a police report over the incident. During the ceremony, Diddy showed up on stage later and attempted to play peacemaker. “Will and Chris, we’re gonna solve that like family at the Gold Party,” he said.

The incident occurred when Smith walked on stage and slapped Rock across the face after the comedian told a joke about Jada’s hair, suggesting that she should star in the sequel to G.I. Jane. Jada has previously opened up about her decision to shave her head last year, and said it was because she had been dealing with alopecia.

“Wow, Will Smith just smacked the shit out of me,” Rock said after the slap, to which Smith responded, “Keep my wife’s name out your fucking moment.” It took a moment for the comedian to collect himself, after which he added, “That was the greatest night in the history of television.”

To add to the drama of the night, Smith walked home with Best Actor for his performance in King Richard, which he accepted just moments after he assaulted Rock.