After Diddy was left feeling disrespected over one of Drake's tracks, there was trouble between the two. Now, the two have agreed to squash the simmering beef. 

The two brawled outside a Miami nightclub around Christmas, but cooler heads prevailed when the two came together for a phone call about four months later, according to TMZ. 

Sources said the "Mo Money, Mo Problems" rapper and the "Started From the Bottom" crooner were both motivated to make peace by their mutual love of further success and additional earnings. With both their schedules filled with such outings as festival concerts, holiday parties and award shows this summer, both knew their paths were bound to pass, and it made sense for them to clear the air now in the name of earning more money later.

It's seemingly a peaceful ending to what could have become a far more volatile situation, particularly after Rap-A-Lot Records CEO James Prince stepped forward shortly after the initial skirmish to warn Diddy and his crew to steer clear and keep their hands off his protege.

"Puffy feeling like he can put his hands on my family, open the doors for his family to be touched," TMZ previously reported Prince raged in a diss track. "You reap what you sow."

Reportedly, all the drama stems from producer Boi-1da giving both Diddy and Drake the same track to record over the last year. According to TMZ, Diddy sat on the new music, infuriating Drake, who was ready to take it to the studio for recording.

When Drake did just that, it was Diddy who became incensed, even more so when the song became popular. When confronted by Diddy, Drake supposedly blew him off leading to blows being exchanged outside the LIV nightclub.