Shyne squashed beef with Diddy?

... after everything that Diddy's put Shyne through (10years in Jail) they've put aside their differences and heres Shyne's explanation.