The feud between rappers Drake and Puff Daddy appears to have reached its end, thanks to an appearance from an unexpected guest at Drizzy’s “Summer Sixteen” tour stop in Greensboro, North Carolina.

Puff Daddy was front and center at the concert, which took place on Tuesday (August 23).

The Bad Boy Records founder, who will soon hit the road for his own tour, merely observed Drake’s show from the front row.

The feud between Drake and Puff Daddy began where most feuds with Drake begin, with a ghostwritten track. Puff reportedly sent the Toronto rapper a track to ghostwrite for him, and Drake instead used the record to create “0-100/The Catch Up.”

The fallout between the two reached its peak when an alleged club brawl in Miami in 2014 left Drake with a dislocated shoulder.

Drake and Puff’s beef appeared to have fizzled out up until the release of “4 PM In Calabasas.” With lyrics like “Take that, take that no love in they heart so they fake that,” the record is littered with subliminals from Drake, which appear to be aimed at Puff.

A brief clip of Puff Daddy in attendance at the “Summer Sixteen” concert, can be found below.