Rick Ross and boxing superstar Floyd Mayweather have finally squashed their beef, after the pair ran into each other in Las Vegas during a New Year's Eve party hosted by Diddy.

The two celebrities had been throwing disses each other's way for quite some time now. Ross recently dissed Mayweather on the Triple C's song "Go," while the boxer talked trash during interviews.

In a recent interview with MTV, Ross revealed that his beef with Mayweather is over.

He says the pair actually ran into each other another time in Vegas since their brief New Year's Eve meeting, and there's no more friction between them.

"Yeah, bumped into Floyd Mayweather," Ross said. "Most definitely. We chopped it up like G's and after a discussion, we shook hands. So that's squashed. It's a new year, it's time to get new money. Y'all know what it is. I kept it 1,000."

There you have it. The beef is dead.