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.

But is this really the end of the battle between Halle and Gabriel? Find out after the jump!