@Nullable
    @Override
    public Action getResolveAction(@NotNull final MergeResult result) {
      if (result == MergeResult.RESOLVED) return null;
      return MergeUtil.createSimpleResolveAction(result, myMergeRequest, myMergeContext, this, false);
    }
@Nullable
    @Override
    public Action getResolveAction(@NotNull final MergeResult result)