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

    onChangeResolved(change);
    myModel.invalidateHighlighters(change.getIndex());
  }
@RequiresEdt
  public void markChangeResolved(@NotNull TextMergeChange change)