fixup backport

MODULE.bazel

@@ -10,16 +10,12 @@ bazel_dep(
 
 bazel_dep(
     name = "bazel_skylib",
-<<<<<<< HEAD
-    version = "1.4.2",
-=======
     version = "1.7.1",
 )
 
 bazel_dep(
     name = "aspect_bazel_lib",
     version = "2.5.3",
->>>>>>> 1de9bb9aab (use the latest bazel_skylib)
 )
 
 bazel_dep(

bazel/bzlmod/secondary_umbrella.bzl

@@ -31,6 +31,6 @@ def secondary_umbrella():
         strip_prefix = "rabbitmq_server-3.11.18",
         # This file is produced just in time by the test-mixed-versions.yaml GitHub Actions workflow.
         urls = [
-            "https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/rbe-25_0/package-generic-unix-for-mixed-version-testing-v3.11.18.tar.xz",
+            "https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/25.0/package-generic-unix-for-mixed-version-testing-v3.11.18.tar.xz",
         ],
     )

deps/rabbitmq_cli/BUILD.bazel

@@ -9,11 +9,6 @@ load(
 )
 load("@rules_erlang//:app_file2.bzl", "app_file")
 load("@rules_erlang//:dialyze.bzl", "dialyze", "plt")
-<<<<<<< HEAD
-load(":rabbitmqctl.bzl", "rabbitmqctl")
-load(":rabbitmqctl_check_formatted.bzl", "rabbitmqctl_check_formatted_test")
-load(":rabbitmqctl_test.bzl", "rabbitmqctl_test")
-=======
 load("@rules_erlang//:erlang_app_info.bzl", "erlang_app_info")
 load("@rules_erlang//:escript.bzl", "escript_archive")
 load(
@@ -23,7 +18,6 @@ load(
     "STARTS_BACKGROUND_BROKER_TAG",
     "without",
 )
->>>>>>> 7f585d4102 (Use rules_elixir to build the cli without mix)
 load("//:rabbitmq_home.bzl", "rabbitmq_home")
 load("//:rabbitmq_run.bzl", "rabbitmq_run")
 load(
@@ -306,38 +300,6 @@ rabbitmq_run(
     visibility = ["//visibility:public"],
 )
 
-<<<<<<< HEAD
-rabbitmqctl_check_formatted_test(
-    name = "check_formatted",
-    size = "small",
-    srcs = [
-        ".formatter.exs",
-        "config/config.exs",
-        "mix.exs",
-    ] + glob([
-        "lib/**/*.ex",
-        "test/**/*.exs",
-    ]),
-    data = glob(["test/fixtures/**/*"]),
-    target_compatible_with = select({
-        "@platforms//os:macos": [
-            "@platforms//os:macos",
-            "@elixir_config//:elixir_1_15",
-        ],
-        "//conditions:default": [
-            "@platforms//os:linux",
-            "@elixir_config//:elixir_1_15",
-        ],
-    }),
-)
-
-test_suite(
-    name = "rabbitmqctl_check_formatted",
-    tests = ["check_formatted"],
-)
-
-=======
->>>>>>> 7f585d4102 (Use rules_elixir to build the cli without mix)
 plt(
     name = "deps_plt",
     apps = [

deps/rabbitmq_ct_helpers/BUILD.bazel

@@ -82,12 +82,8 @@ plt(
     plt = "//:base_plt",
     deps = [
         "//deps/rabbit:erlang_app",  # keep
-<<<<<<< HEAD
         "//deps/rabbit/apps/rabbitmq_prelaunch:erlang_app",  # keep
-        "//deps/rabbitmq_cli:elixir",  # keep
-=======
         "@rules_elixir//elixir",  # keep
->>>>>>> 7f585d4102 (Use rules_elixir to build the cli without mix)
         "//deps/rabbitmq_cli:erlang_app",  # keep
         "//deps/rabbitmq_management_agent:erlang_app",  # keep
         "@proper//:erlang_app",  # keep