Fixing merge, and syntax errors