more merge conflicts + syntax errors