@NotNull
  @Override
  public List<TextMergeChange> getChanges() {
    return ContainerUtil.filter(myAllMergeChanges, mergeChange -> !mergeChange.isResolved());
  }
@NotNull
  @Override
  public List<TextMergeChange> getChanges()