For years, undefeated boxer Floyd Mayweather and rapper 50 Cent were close friends. Then, several months ago, something happened and the two friends waged a social media war against each other, trading insults and more.

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


Now, it seems the feud has been settled just before Mayweather's match against Manny Pacquiao, if 50 Cent's Instagram post on Thursday is any indication.

"THE original MONEY TEAM, you gotta love it. My brother ready, May 2 don't get scared now," 50 Cent wrote on Instagram.

"Money Team" refers to Mayweather's entourage. The post includes a photo of 50 Cent and Mayweather outside a casino in Las Vegas, Nevada where the boxer will fight Pacquiao on May 2.

Even before there was evidence of a reconciliation, the "In Da Club" rapper predicted Mayweather would defeat Pacquiao and said he planned to bet roughly $1.6 million on the match.

"I got champ, champ gonna smoke him," 50 Cent told radio station Power 105.1's "Breakfast Club" morning show. "It's gonna look like [the fight] was pumped up for no reason."

In the "Breakfast Club" interview, the rapper mentioned that he and Mayweather spoke at a Chris Brown concert in February for the first time in "a while."

In August of last year, tension between the two climaxed when Mayweather said during a mlive.com interview that "Hip-hop artists like Nelly, 50 Cent and T.I. come and go ... but I'm still here."

50 Cent countered with an Instagram video challenging Mayweather to read one full page of the "Harry Potter" book series out loud "without stopping or starting or [expletive] up." If Mayweather succeeds, 50 said he'd donate $750,000 to the charity of Mayweather's choice.

What caused the rift in their friendship has never been explained, however, Mayweather's father, Floyd Mayweather Sr., said the feud started because Mayweather decided to stop hanging out with 50 Cent.