Just do the zipper merge, for the sake of all things holy

Merging late means getting home sooner for all.