Last December, Puff Daddy, who was then called Diddy, became the Drake Slapper when he introduced the Canadian to the palm of his hand outside of a Miami club.

Initial reports had the one-sided fight over a girl. But we quickly learned it was about the Boi-1da beat that eventually became Drake's hit 'O to 100.'

Rappers who beef over beats are all business, and TMZ reports that it was business considerations that had the two Hip Hop heavyweights work out their issues via a phone summit last month.

According to the gossip site, Drake and Puffy realized that they would be crossing paths quite a few time this summer as they do festival, parties, award shows and album promotion. So instead of risking any more open-fisted combat, they decided to clear the air.

Puffy's album Money Making Mitch drops June 29th, and Drake's Views From the 6 could come at just about any moment.

Views.

— Drizzy (@Drake) May 10, 2015