[oc] zipper merge fail — I’m not mad just disappointed