Fixed syntax errors with merge