It’s all love between J. Cole and Diddy.

Eight years after their infamous fight, the two reunited and showed the world that they remain on good terms. On Wednesday (June 9), Diddy posted a photo of him posing alongside the Dreamville rapper on a balcony overlooking New York City.

 

View this post on Instagram

 

A post shared by Hip Hop U-C-IT 🏁 (@hhucit_)

“With LOVE. 🖤✨💫 @realcoleworld,” he captioned it.

They also playfully reenacted the drama in a video where Cole put up his arms as though he was about to box Diddy, who shared a laugh with Cole before striking his own fight stance. “and then this happened,” added Puff.

 

View this post on Instagram

 

A post shared by Hip Hop U-C-IT 🏁 (@hhucit_)

Cole addressed his “scrap” with the Bad Boy mogul on “Let Go My Hand” off his latest album The-Off Season, which features Diddy on the outro.

“My last scrap was with Puff Daddy, who would’ve thought it?” raps Cole. “I bought that ni**a album in seventh grade and played it so much / You would’ve thought my favorite rapper was Puff / Back then I ain’t know shit, now I know too much.”

Speaking with the “Say Less” podcast, Cole’s manager Ibrahim “IB” Hamad recalled what happened between the two at Diddy’s MTV Video Music Awards after-party in August 2013.

“The Puff story… I mean remember hearing it and just laughing ’cause I was there,” said Hamad. “I’m not gonna go into detail, but it’s definitely not what people are saying.”

Rumor has it that Cole intervened when Puff tried to throw a drink on Kendrick Lamar after hearing his controversial “King of New York” line on Big Sean’s “Control.” After the scuffle, Cole was allegedly kicked out of the party.

“It was definitely not like he was defending Kendrick or something,” explained Hamad. “It wasn’t like, ‘Don’t talk to Kendrick like that!’ Kendrick was there, Top [Dawg] was there, Jay was there, Beyoncé was there. Me and Cole. You know, grown men… Got a little heated. All I remember is, me and Jay looking at each other like, ‘Oh, these n***as ’bout to fight.’ And then just being like, ‘Oh no, this is ’bout to happen.’ I’ll just leave it at that.”

But the following day, Cole and Diddy met up and squashed their beef.

“Puff was like, ‘I wanna figure this out.’ The next day, he pulled up, they chopped it up. It was never a real issue,” said Hamad.