The beef between Rick Ross and Floyd Mayweather almost got physical last weekend, but according to TMZ, Diddy saved the day.

The gossip site reports that both men were at the grand opening of the new Vanity nightclub in Las Vegas’ Hard Rock Hotel over the weekend, when the incident occurred. Apparently after bumping into each other their entourages immediately became confrontational. Diddy, who was hosting the party at the new hot spot, reportedly mediated the two crews before anyone got hurt.

The Miami Boss and the Welterweight champ have been waging a cold war over the past several months ever since the rapper called out Pretty Boy Floyd during his verbal war with 50 Cent.

In related news, Diddy and Ross plan on dropping a video for Dirty Money’s “Angels” remix shortly. —Elan Mancini