Floyd Mayweather has a big battle in the ring in a couple of weeks. But he no longer has to worry about his out-of-the-ring feud with 50 Cent. At least for now.

The friends-turned-hilarious-enemies have made up after about a year of accusations of woman-beating, irrelevance and first grade reading skills.

Fif and Money hung out last night in Las Vegas, and early this morning 50 posted on Instagram this record of their reunification

THE original MONEY TEAM, you gotta love it. My brother ready,may 2 don't get scared now. #FRIGO #EFFENVODKA #SMSAUDIO

A photo posted by 50 Cent (@50cent) on Apr 23, 2015 at 4:27am PDT

Does this mean Fif will walk out with Mayweather (and Justin Bieber) on May 2nd?

It certainly means we won't be getting videos like this for a while, which is too bad.