fixup merge error 3