compiletest: Remove stray merge markers.