Diggy and J. Cole have had a bit of a tiff for the past couple months, after Diggy made a diss track toward Cole for alluding to bedding his older sister and for using his name in a rhyme in not the most positive way. Cole touched on it briefly in an interview and that was it until both were on the same bill at last night’s Summer Jam in San Fransisco. Allhiphop has details on what happened below.

Marisa Mendez

Last night at KMEL’s Summer Jam in San Francisco, California, Diggy Simmons and J.Cole put their differences aside in the hallway of the venue and squashed their beef.

Both artists’ publicists, body guards and crew blocked all cameras from taking pictures, but multiple witnesses saw them say they were sorry, embrace and walk back to their neighboring dressing rooms.

No word on if the two will be working together, but the beef has been squashed by both artists at this point.