J.Cole and Diddy have buried the hatchet in years since.

With the release of his highly-anticipated album The Off-Season, J.Cole returned to the spotlight after three years of (relative) silence. The album got pretty personal on the track "Let Go My Hand," as Cole confirmed a rumor from 2013 involving a scuffle between he and Diddy.

As the story goes, at an afterparty for the MTV Video Music Awards in New York City, a "clearly intoxicated" Diddy confronted Kendrick Lamar about his controversial "Control" verse, where he referred to himself as the "King of New York." Diddy attempted to spill a drink on Lamar, and Cole apparently intervened.

"Couple wins, couple losses/Some broken up too quick to call it," Cole raps. "My last scrap was with Puff Daddy, who would’ve thought it?/I bought that n---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 s--t, now I know too much.”

The two have since made peace. In a YouTube video on the REVOLT TV channel titled "J.Cole and Diddy Fight Caught on Tape," the two jokingly trade blows. Diddy even appears on "Let Go My Hand" to offer some words of prayer.

Diddy hasn't commented as of yet, but his last post on Instagram is funny in retrospect. The post shows none other than Kendrick Lamar, speaking about love and human's purpose. "Welcome to the LOVE era!" Diddy captioned the video, "Have a love filled day! LOVE."

Stay tuned for further updates on J.Cole, Diddy, and Kendrick Lamar.