public void ignoreChange(@NotNull TextMergeChange change, @NotNull Side side, boolean resolveChange) {
    if (!change.isConflict() || resolveChange) {
      markChangeResolved(change);
    }
    else {
      markChangeResolved(change, side);
    }
  }
public void ignoreChange(@NotNull TextMergeChange change, @NotNull Side side, boolean resolveChange)