Last week news leaked that Cassie Ventura and her parents called the cops on Cassie's long-term boyfriend Sean 'Diddy' Combs after Diddy reacted badly to Cassie wanting to end their relationship [click here if you missed that].
Apparently the two have kissed and made up...
Last night Khloe Kardashian posted pictures from Cassie's birthday celebration and Diddy was there, too.
