[OC] Proper zipper merge