[PATCH] Fixup merge error