fix a syntax error from a user-provided merge