removed merge syntax error