editor cursor is not within a merge conflict