Gabriel Aubry halle berry goof hat running nahla jeans Olivier Martinez boots halle berry jacket

While Olivier Martinez was at the liquor store and tooting around town in his rare vintage Aston Martin, Gabriel Aubry and daughter Nahla shared a special moment after school on Wednesday.

Now that both Gabriel and former partner Halle Berry have seemingly ironed out their custody agreement, all that drama over Thanksgiving is now just water under the bridge. Halle and Olivier didn’t end up pressing charges again Gabriel after the two men got into a nasty brawl, and Gabriel, who was reportedly set to file a restraining order against Martinez, later changed his mind.

Martinez was ordered to stay away during custody exchanges between Halle and Gabriel, and so far it seems like everything is working out well.