Shyne and Diddy officially End Feud at Fashion Week [PHOTO]