Fix merged syntax error