When Puff Daddy took the stage at the 2016 MTV Video Music Awards this weekend to accept the Best Hip-Hop Video award on Drake's behalf, Twitter tried to gas up the situation, spinning it as more beef between the two. Reports later indicated that the rappers had long ago buried the hatchet and are now friends. Of course, this hasn't always been the case; the pair once had a major disagreement over ghostwriting and beat usage, which included a very public fight at a Miami nightclub in 2014. This timeline charts the ups and downs of Drake and Puffy's falling out and eventual reunion.