compiletest: Remove stray merge markers and fix some tests.