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