diff --git a/.github/workflows/check-build-system-equivalence.yaml b/.github/workflows/check-build-system-equivalence.yaml
index d7c4a58c4913..4270a918797c 100644
--- a/.github/workflows/check-build-system-equivalence.yaml
+++ b/.github/workflows/check-build-system-equivalence.yaml
@@ -29,6 +29,7 @@ on:
         required: true
         default: "3.13.0"
 env:
+<<<<<<< HEAD
 <<<<<<< HEAD
   erlang_version: 25.3
   elixir_version: 1.15
@@ -42,6 +43,11 @@ env:
   VERSION: ${{ inputs.project_version || github.event.inputs.project_version }}
 >>>>>>> 66a887bc6a (Run bazel/make equivalence checks on all release branches)
 >>>>>>> c5bc4ef5e6 (Run bazel/make equivalence checks on all release branches)
+=======
+  erlang_version: ${{ inputs.erlang_version || github.event.inputs.erlang_version }}
+  elixir_version: ${{ inputs.elixir_version || github.event.inputs.elixir_version }}
+  VERSION: ${{ inputs.project_version || github.event.inputs.project_version }}
+>>>>>>> ec2f91821e (Resolve a conflict (#9065))
   PLUGINS: amqp10_common amqp10_client rabbitmq_amqp1_0 rabbitmq_auth_backend_cache rabbitmq_auth_backend_http rabbitmq_auth_backend_ldap rabbitmq_auth_backend_oauth2 rabbitmq_auth_mechanism_ssl rabbitmq_consistent_hash_exchange rabbitmq_event_exchange rabbitmq_federation rabbitmq_jms_topic_exchange rabbitmq_mqtt rabbitmq_random_exchange rabbitmq_recent_history_exchange rabbitmq_sharding rabbitmq_shovel rabbitmq_stomp rabbitmq_stream rabbitmq_trust_store rabbitmq_web_dispatch rabbitmq_management_agent rabbitmq_management rabbitmq_prometheus rabbitmq_federation_management rabbitmq_shovel_management rabbitmq_stream_management rabbitmq_top rabbitmq_tracing rabbitmq_web_mqtt rabbitmq_web_mqtt_examples rabbitmq_web_stomp rabbitmq_web_stomp_examples rabbitmq_aws rabbitmq_peer_discovery_common rabbitmq_peer_discovery_aws rabbitmq_peer_discovery_k8s rabbitmq_peer_discovery_consul rabbitmq_peer_discovery_etcd
   EXTRA_PLUGINS: accept amqp_client aten base64url cowboy cowlib credentials_obfuscation cuttlefish eetcd enough gen_batch_server getopt gun jose observer_cli osiris prometheus quantile_estimator ra ranch recon redbug seshat stdout_formatter syslog sysmon_handler systemd thoas
 jobs: