KMEL's Summer Jam kicked off in San Francisco Tuesday night and of the performers set to hit the stage were J. Cole and Diggy Simmons. In the past, the two have had their differences and Diggy even came out with a diss track.

But according to multiple witnesses who were in surrounding areas, the two artists put an end to their feud. It's even been reported that the two told each other that they were sorry as they walked back to their nearby dressing rooms.

Their issues started after Diggy took exception to a J. Cole lyric about Simmons' sister, Vanessa.

Cole spits: "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."

The situation blew up when Diggy released his diss track "What You Say To Me" in which he targeted Cole and defended his family.

But all of that seems to be a thing of the past now.

Source: allhiphop.com