@NotNull
  public static ConflictAction from(@NotNull String actionName) {
    ConflictAction result = ourAllActions.get(actionName);

    if (result == null) {
      throw new IllegalArgumentException("Unknown conflict action " + actionName);
    }

    return result;
  }
@NotNull
  public static ConflictAction from(@NotNull String actionName)