public @NotNull Conflict merge(@NotNull Conflict conflict) {
      return new Conflict(Stream.concat(messages.stream(), conflict.messages.stream()).distinct().toList());
    }
public @NotNull Conflict merge(@NotNull Conflict conflict)