@RequiresEdt
  public void markChangeResolved(@NotNull TextMergeChange change, @NotNull Side side) {
    if (change.isResolved(side)) return;
    change.setResolved(side, true);

    if (change.isResolved()) onChangeResolved(change);
    myModel.invalidateHighlighters(change.getIndex());
  }
@RequiresEdt
  public void markChangeResolved(@NotNull TextMergeChange change, @NotNull Side side)