Diddy has been feeling some type of way about Drake ever since he felt that Drake stole the “0 to 100″ beat from him last year. It was also alleged that the two came to blows outside of a Miami nightclub, LIV, over the song, leaving the “6 God” with an injured shoulder. Now, TMZ reports that the two have made amends.

The site reports that they made peace over the phone. They decided that since they are going to be running into each other a lot at various events since they both have albums dropping soon, that it would best to let bygones be bygones.

Diddy’s next album, Money Making Mitch, will drop on June 29th while fans are patiently waiting for Drake’s Views From the 6.