Added back the ConflictEditorTextOperation

This is temporary. The AST inferencer seems to use therefore I brought
it back from the grave.
At some point I’ll remove it.