After years of fighting a child custody battle in court — and less than a week after the Thanksgiving family brawl between Halle Berry's baby daddy Gabriel Aubry and fiance Olivier Martinez — a truce has been made on both sides.

A court hearing between Halle and Gabriel took place yesterday after she filed a restraining order against him following the fight (and Gabriel's own restraining order against Olivier). There may be a very tense, awkward Christmas at Halle's place this year because some kind of truce has reportedly been reached. "The parties have reached an amicable agreement. There will be no further statements regarding this matter," said Halle's lawyer Blair Berk, according to the New York Daily News.

Related Article: Halle Berry Wants Restraining Order Against Baby Daddy

Related Article: Halle Berry Rushed to Hospital After Minor Accident On Set

Since police believe Gabriel initiated the fight, it's possible authorities could still pursue a criminal case against the male model. However, that appears unlikely because he has no history of violent crime and, well, Olivier kicked his ass. The only injuries Olivier sustained were to his hand from punching Gabriel in the face repeatedly.

For the sake of their four-year-old daughter Nahla, let's hope this is the end of the conflict. And if Halle goes through similar drama in the future with Olivier, we'll know where to point the blame this time.

Are you relieved to see the Halle-Gabriel battle FINALLY coming to an end?

Photos courtesy of Getty Images