Clear remaining merge conflict highlighting.
Undo formatting changes.