Fixed merge syntax errors