Last night, radio station KMEL held their annual Summer Jam concert in San Francisco, California. Everyone from Rick Ross to Wiz Khalifa came through to tear the stage down.

Two of the concert’s guests on hand were Diggy and J. Cole, who have been involved in a minor squabble.

AllHipHop is reporting that the beef is no more.

Reportedly, the two rappers bumped into each other backstage, spoke for a couple of moments, embraced and apologized to each other.

Earlier this year, the two rappers entered into a short pissing match with each other when Diggy dropped a song called “What You Say To Me,” where he threw shots at J. Cole.

Diggy has said that the song was a response to a rhyme Cole wrote on a track called “Purple Rain.” On the song, Diggy felt like J. Cole was talking about a sexual encounter with his sister Vanessa Simmons that never occurred:

“Good girl, huh? Father was a preacher, sent her off to college thought I got her on a leash though. From the outside though, them girls be the squeakiest. You get ‘em inside them girls be the freakiest.”

Let’s hope this beef is officially squashed and all of this can be put to bed.