It's been a tough week for everyone surrounding Halle Berry and her daughter Nahla. On Thanksgiving last Thursday (Nov. 22nd) Berry's current fiancee Olivier Martinez and, her ex, father of Nahla, Gabriel Aubry, had a horrific brawl that left Aubry's face battered and bruised, and Martinez's hand in a splint. Pretty Nasty. However, the sun is on the horizon as Aubry was reunited with his beloved daughter today, according to TMZ.

Both Martinez and Aubry ended up firstly in hospital and later in the police station on Thursday, and since then both parties have taken out emergency restraining orders on one another. The whole argument began due to a custody battle between Halle and Aubry, because Halle wants to take Nahla over to Paris where she and Olivier plan to live together, effectively ripping Aubry from his daughter. The judge, of course, agreed with Aubry that this idea was preposterous and did not grant that right to Berry. 

On the 29th of November they reached an agreement which meant the restraining orders were dropped and have enabled Aubry to see Nahla again. Clair Berk, Halle Berry's legal representative said, "The parties have reached an amicable agreement. There will be no further statements regarding this matter." Smiles all round then, and just in time for Christmas.