50 Cent and Floyd Mayweather’s highly publicized beef has seemingly come to an end after Fif revealed that the famed athlete will attend his Tycoon Comedy Music Festival, which runs from August 25-28.

The long-standing feud between boxing legend Floyd Mayweather and hip hop star 50 Cent has apparently come to an end. According to TMZ Sports, 50 Cent revealed during an appearance on The Breakfast Club that he made amends with Mayweather at a comedy show earlier this year. Mayweather and 50 Cent had a close relationship up until a falling out in 2012 stemming from a money dispute. The rapper would constantly call out Mayweather over the ensuing years, including a viral video in which he challenged the former multiple-division world champion to prove he could read.