Fixed conflicts and syntax errors