@NotNull
  public static ConflictState from(@NotNull Status status) {
    return getInstance(status.getTreeConflict() != null, status.is(StatusType.STATUS_CONFLICTED),
                       status.isProperty(StatusType.STATUS_CONFLICTED));
  }
@NotNull
  public static ConflictState from(@NotNull Status status)