Remove stray merge conflict markers