Boxer Floyd Mayweather and rapper Rick Ross finally ran into each other recently while in Las Vegas partying over the weekend after numerous jabs back and forth in the media.

The two stars were close to throwing fists, but Diddy stepped in to save the day.

The incident took place at Vegas’ Hard Rock Hotel during the opening of Vanity nightclub, which Diddy hosted.

Mayweather reportedly hit the party to support Diddy when he literally ran into Ross. Source say that both men “bumped” into one another with their entourages in tow, all of whom became instantly “confrontational.”

But before anything popped off, Diddy stepped in to intervene, calming both crews down.

Both Mayweather and Ross eventually headed into the event and partied the rest of the evening without incident.

While things were OK during the Vegas weekend, it’s still unknown if the two settled their differences or put them aside for just one evening.