Drake and Diddy reportedly got into a fistfight last December over “0 To 100/The Catch Up,” the Boi-1da-produced banger that Diddy claims was originally intended for him before Drake turned it into one of the best songs of 2014. But whatever tension had accumulated between the two rap A-listers since then has now dissipated. TMZ reports that Drake and Diddy worked out their differences by phone last month after realizing that their paths would cross quite a few times this year at festivals, awards shows, and other events. Explains the report, “We’re told they decided to clear the air since both would rather make money than war.” Sounds like that conflict ended just like it began: real fuckin’ quick.