Fixed merge syntax error