Back in December, Diddyallegedly punchedDrake outside Liv in Miami in a dispute over the “0-100″ beat. The two stars reportedly talked over the phone back in April and hashed out their differences.

Both parties had remained mum on the incident but one of Drake’s early supporters, J. Prince released a recording several months ago warning Diddy and a few others to basically leave Drake alone or face some consequences.

We’re glad these two talked out their problems. But if there’s a lesson to be learned in all of this, it’s that Diddy don’t play…

UP NEXT: Jay Z & Beyonce Are More Involved In Protests Than People Think