So much for the truce! Diddy and Shyne had a longstanding beef over the 1999 shooting that put Shyne in jail, but made peace last year and all seemed well. Well, not so much. Apparently Diddy didn't make good on some promises he'd made to Shyne, and now the beef is back on. At least he sounds good on the diss track!