They're battling no more. Jenna Jameson and Tito Ortiz had a very public kiss-and-make-up session in Huntington Beach, CA Friday, and RadarOnline.com has all the photos.
It was only two weeks ago that former adult film star Jenna accused Tito of domestic violence, resulting in the arrest of the former UFC champion.
Tito tearfully denied he'd hurt his girlfriend of four years, saying instead he had only confronted her about her alleged abuse of prescription drugs. Jenna denied she misused prescriptions and claimed she'd even tested clean in a drug screening.
In an exclusive interview with RadarOnline.com, Jenna later softened her allegations, insisting that "everybody makes mistakes."
Jenna and Tito, the parents of 14-month-old twin boys, seem to just want the old incident to go away now, so they can move on with their lives.
The District Attorney has not yet announced if Tito will be charged.