Sean “Diddy” Combs may get off the hook in the recent police investigation of a fight he was involved in, by reaching an agreement with his alleged victim.

Sean Combs and Steven Acevedo were involved in a bit of a brawl early Saturday morning at Manhattan nightclub Kiosk in SoHo. Combs reportedly punched the man twice and threatened, “I’ll kill you, punk.” Acevedo also said one of the rapper’s bodyguards lifted his shirt so as to warn he had a gun.

The reason of their discontent? “A striking blonde,” the New York Post reported this week. The woman allegedly accompanied the hip-hop mogul to Cannes, France this summer.

Acevedo had dated her as well. She was not at the club when the fight broke out.

Diddy faced being charged with third-degree assault, a misdemeanor, and issued a desk appearance ticket for his role in the incident, the NY Post reported. Things seem to have changed over the past couple of the days, as the same paper reports that Combs and Acevedo were seen together Monday.

The two men reportedly met Monday night, discussed for about an hour and then each minded his own business. The results of that meeting became known the next day, when Combs' lawyer, Benjamin Brafman, said Tuesday that he didn’t think the rapper would face further legal woes from Acevedo.

“We are hopeful that this matter will be resolved without the filing of any criminal charges as this was a disagreement among acquaintances, not a criminal assault,” the NY Post quoted him as saying.

A police source told the paper, “A little money will change hands, and the punch will be like it never existed,” showing that he expected the complaint to be retrieved.

Police officers were reportedly investigating Monday whether Combs’ bodyguard was indeed armed, as Acevedo suggested he may have been.

Diddy is no stranger to scraps over women, as he was reportedly at the center of a similar incident earlier this year, before an after-Oscars party.