TMZ is reporting that the feud between Floyd Mayweather and Rick Ross took a turn when they showed up in Vegas at an event hosted by Diddy.

Both Mayweather and Ross were in Vegas for the opening of the Vanity nightclub which is part of the Hard Rock Hotel. The two nearly walked on top of each other as one "bumped" the other as they passed by igniting their entourages. Luckily Diddy swooped in to ease the tension and the two camps partied without any more problems.

Photos: TMZ.com