Fix syntax errors
Fix merge conflicts