Lil Wayne and Justin Bieber’s manager, Scooter Braun, have reportedly resolved a conflict the two had.

Wayne was reportedly feuding with Braun over Lil Twist, however, he has learned Twist “may have blew some details out of proportion,” according to TMZ

The publication cites sources close to Wayne who say Braun and Wayne’s manager have had a discussion about this matter. 

In May, Lil Wayne spoke about Braun with the following statement: 

“I heard this bitch-ass nigga Scooter talkin’ shit about my little brother,” the rapper said at the time, standing next to Lil Twist. “Nigga, this my mothafuckin’ brother. Anything you got to say, when you see me, say it to my motherfuckin’ face. And if you do happen to say it to my motherfuckin’ face, I ain’t gonna make you eat them words, nigga. I’ma put them bitches on your tombstone…Fuck you, Scooter.”

TMZ now reports Twist may have exaggerated some aspects of this to Wayne and that Wayne has calmed down about the matter since the above statements were made. 

RELATED: Lil Wayne Blasts Justin Bieber’s Manager, Defends Lil Twist