Rick Ross, Floyd Mayweather Squash Beef

(AllHipHop News) The feud between heavyweight Carol City, Florida rapper Rick Ross and multi-division boxing champion Floyd Mayweather has come to an end.

According to Ross, the two men met and squashed a beef, which saw both sides making unflattering comments about the other.

Additionally, Mayweather took a series of infamous, offensive pictures with Ross’ rival 50 Cent, along with his son William Roberts Jr. and his ex-girlfriend, Tia Kemp.

"Yeah, bumped into Floyd Mayweather," Ross told MTV News. "Most definitely. We chopped it up like G's and after a discussion, we shook hands. So that's squashed.”

Their feud ignited in 2009, when Rick Ross name checked Floyd Mayweather on his 2009 track “Mafia Music.”

Floyd responded immediately in August of 2009 and called out the rapper, due to his past as a correctional officer.

“He can learn how to get money from me,” Mayweather retorted. “If he’s a cop and rapping about selling drugs, I guess he was a dirty cop! You know me, I’m not ducking and dodging no one, it’s not hard to find me.”

The following month, Ross dropped a diss track aimed at Mayweather titled War, which was released after Mayweather made the unflattering comments about Ross to AllHipHop.com.

The two men and their entourages almost came to blows in Las Vegas during a party hosted by Sean “Diddy” Combs.

“It's a new year, it's time to get new money,” Ross told MTV News. “Y'all know what it is. I kept it 1,000."

In related news, a snippet of Ross’ upcoming video "Mafia Music 2" recently hit the Internet.

The song and the video are taken from his new album Teflon Don, which is due in stores this year.