diff --git a/bazel/bzlmod/secondary_umbrella.bzl b/bazel/bzlmod/secondary_umbrella.bzl
index 961fde28a83e..24b3bd6a1cfe 100644
--- a/bazel/bzlmod/secondary_umbrella.bzl
+++ b/bazel/bzlmod/secondary_umbrella.bzl
@@ -32,6 +32,7 @@ def secondary_umbrella():
         urls = [
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             "https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/rbe-25/package-generic-unix-for-mixed-version-testing-v3.10.24.tar.xz",
 =======
@@ -56,5 +57,8 @@ def secondary_umbrella():
 =======
             "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"
 >>>>>>> 91b4d0f5b1 (Resolve a conflict #11488 #11478 #11500)
+=======
+            "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",
+>>>>>>> 76e0da11d7 (Secondary umbrella: resolve a conflict)
         ],
     )