Fixed auto-merge syntax errors