The history between Jay Z and the Harlem-based Diplomats crew has long been a thorny one. Under the supervision of Jay’s Roc-a-fella Records, Diplomats mainstay Cam’ron had the biggest record of his career, and Roc-a-fella co-founder Dame Dash and Diplomats capo Jim Jones grew up together.

But starting in the mid-2000s, a series of personal and business disagreements led to bad blood between (and within) the two camps, with diss tracks flying back and forth (and back…and forth…)

Now, it appears all of that is at an end. On Tuesday, Vic Medina of Roc Nation posted a photo on Instagram of Jim Jones signing some paperwork. He captioned it, “It’s a done deal… Jim Jones/Roc Nation.”

No details are available yet about the nature of the deal, but many fans were surprised, given that Jones was still dropping Jay Z diss songs as recently as two years ago.