Halle Berry and her ex-boyfriend Gabriel Aubry settled a court dispute following a Thanksgiving Day fight between Aubry and the actress' fiance Olivier Martinez, according to The Associated Press.

The model and Berry have been battling over custody of their daughter Nahla, 4, for months now and they appeared twice in family court since the fight, the report added. A judge recently denied Berry permission to move Nahla with her to France, where Martinez is a citizen. The ruling has caused tension among the parties and Martinez reportedly threatened Aubry's life during their fight saying, "When you see the judge, you're going to tell him you're going to Paris or I'm going to kill you." 

Aubry was arrested after the Thanksgiving Day fight, which left him with a black eye, a broken rib and other injuries. He was later released on bail and obtained an emergency restraining order against Martinez on Nov. 26. Aubry currently faces a restraining order that forces him to stay 100 yards away from Martinez, Berry and Nahla. 

Blair Berk, Berry' attorney, and Shawn Holley, from Aubry's party, released a statement after Thursday's hearing that said the two sides reached an amicable agreement, however no other details were released at the time and the attorneys refused to answer questions.

Nahla's involvement in the fight was also called into question by many reports. Though she was not physically involved or harmed at the time, she reportedly witnessed Martinez and Aubry fight in front of Berry's California residence. When LAPD detectives showed up at the scene, they called Child Protection Services, according to an insider. The new detail launched an investigation into Nahla's well-being.

"Detectives from the LAPD formally contacted the CPS [Child Protective Services] after Gabe's arrest, because Nahla was present when the fight occurred," according to the source. "Social workers will be interviewing Halle, Gabriel and Olivier about what happened on Thanksgiving. DCFS must ensure that Nahla's environment is safe."