Gabriel Aubry on October 27, 2010 in L.A. Olivier Martinez on October 5, 2012 in Beverly Hills,. Credit: Jason Merritt; Gregg DeGuire/Getty Images

Things are looking up for Gabriel Aubry.

Shortly after reuniting with Nahla, the 4-year-old daughter he shares with ex Halle Berry, on Friday, Nov. 30, the French-Canadian model, 36, dropped the restraining order he had in place against Berry's fiance, Olivier Martinez, TMZ reports.

Following Aubry's Thanksgiving Day brawl with Martinez, 46, the model was granted his own legal protection against Berry's fiance. In a legal declaration, Aubry claimed that in the midst of their fight -- which began when Aubry picked up Nahla from Berry's home for a custodial visit -- Martinez threatened to kill Aubry if he refused to allow his ex to move to France with their daughter.

On Thursday, Nov. 29, Aubry and Berry, 46, "reached an amicable agreement" over the care of their child, according to a written statement released by Berry's attorney, Blair Berk. Though specifics were not made available, the agreement ends a nearly two-year long bitter custody battle for the exes.

Argues a source close to the Oscar-winning actress: "All [Halle] wants is a normal family life."