Attorneys announced on early Friday that Halle Berry and her ex-boyfriend Gabriel Aubry have settled the battle for the custody of their four-year-old daughter, Nahla. According to the Associated Press, the judge decided whether Aubry could resume visiting his daughter or not.

The dispute between Halle Berry and her ex-partner, Gabriel Aubry has been making headlines for many months. The battle gradually worsened and culminated with the Thanksgiving Day brawl between Berry’s fiancé, Olivier Martinez, and Aubry. An agreement was finally reached on Friday, according to the legal representatives of the two parties.

The two sides appeared in court on Friday to establish whether Aubry can continue to visit his daughter or not after the fight. Blair Berk, the actress’ attorney and Shawn Chapman Holley, Aubry’s legal representative, told the press that the former lovers have reached an amicable agreement. No other details have been provided in relation to the matter as the two parties do not wish to disclose the provisions of the settlement.

Berry and Aubry were legally fighting over the custody of their four-year-old daughter, Nahla. The actress requested the Canadian model’s permission to take the girl to France, but Aubry took the case to court. On November 22, the Canadian model arrived at the actress’ house to let Nahla spend Thanksgiving Day with her mother. He got involved into a fight with the actress’ fiancé, Martinez and was taken to the nearest hospital for severe injuries.

Aubry was charged with battery, but he filed a new lawsuit claiming he was the victim of the assault and was forced to fight in self-defense. He wrote in court papers that it was Martinez who attacked and threatened to kill him. The judge granted Aubry a temporary restraining order against the French actor the following day.