Diddy famously assaulted Drake in December of 2014 over the beat that became  ''0-100/The Catch Up."

The two rap titans are good now. In fact, they've been hinting at a project together.

During a recent interview with The Breakfast Club, Diddy explained making up with Drake.

"We just bumped into each other, we just kicked it. Sat down and kicked it. Two men. Had some real talk and kept it moving. It wasn't no need to be the end of the world. I didn't have no malice towards him. It was just one of those nights. We moved past it as men. We was cool before. That's why everything went down. Sometimes brothers have scraps. I gotta be able to move past it. We gotta be able to have scraps with each other and move past it," Diddy said

Diddy went on to say that he is a different person than he was a few years ago, when he thought he had to be the guy who always threw the first punch.

During those bad old days, Puff tried to confront Kendrick Lamar over his “King of New York” claim in his “Control” verse and ended up scrapping with Kendrick's buddy J. Cole at the 2013 VMAs.

When asked by CTG if he's cleared things up with Cole, he said that he had.

"Yes I did. I put all of that in my past," Diddy said.

You can hear about how Puff became a new man named "Love" at the 43-minute mark.