Things are finally copacetic between Halle Berry, her ex-boyfriend Gabriel Aubry and her fiance` Olivier Martinez.

Last night (Nov. 29), Aubry appeared in family court in Los Angeles, and with his and Berry's lawyers in tow (Berry nor Martinez attended), they made amends.

“The parties have reached an amicable agreement," said Berry's lawyer Blair Berk and Gabriel's attorney Shawn Holley, in a written statement. "There will be no further statements regarding this matter.”

But while the lawyers weren't exactly clear on what the agreement even meant, a source close to the situation says it resolves the child-custody wrangling that has been ongoing with Nahla, the daughter that Berry and Aubry have together. And in the very short term, the restraining orders that each party has against one another will expire, allowing Aubry to see his daughter again.

[via Page Six]