[OC] Not a fan of the zipper merge? Consider trying the no merge