Patchup merge