Diageo said it has reached an agreement with Sean “Diddy” Combs, after the rapper accused the group of racial discrimination and alleged it neglected his DeLeón brand.

The liquor maker—which owns Johnnie Walker whisky and Tanqueray gin—said Tuesday that Combs has withdrawn all of his allegations about Diageo and will voluntarily dismiss his lawsuits against the company with prejudice.