@Nullable
    @Override
    protected TextMergeChange.State processDocumentChange(int index, int oldLine1, int oldLine2, int shift) {
      TextMergeChange.State state = super.processDocumentChange(index, oldLine1, oldLine2, shift);

      TextMergeChange mergeChange = myAllMergeChanges.get(index);
      if (mergeChange.getStartLine() == mergeChange.getEndLine() &&
          mergeChange.getConflictType().getType() == MergeConflictType.Type.DELETED && !mergeChange.isResolved()) {
        markChangeResolved(mergeChange);
      }

      return state;
    }
@Nullable
    @Override
    protected TextMergeChange.State processDocumentChange(int index, int oldLine1, int oldLine2, int shift)