diff --git a/.buildkite/scripts/steps/k8s-extended-tests.sh b/.buildkite/scripts/steps/k8s-extended-tests.sh
index 85bd27b2132..c5ead9e660e 100644
--- a/.buildkite/scripts/steps/k8s-extended-tests.sh
+++ b/.buildkite/scripts/steps/k8s-extended-tests.sh
@@ -25,13 +25,8 @@ else
   exit 10
 fi
 
-<<<<<<< HEAD
-AGENT_PACKAGE_VERSION="8.16.0" DEV=true SNAPSHOT=true EXTERNAL=true PACKAGES=docker mage -v package
-AGENT_VERSION="8.16.0-SNAPSHOT" AGENT_STACK_VERSION="8.16.0-SNAPSHOT" TEST_INTEG_CLEAN_ON_EXIT=true INSTANCE_PROVISIONER=kind STACK_PROVISIONER=stateful SNAPSHOT=true mage integration:kubernetesMatrix
-=======
 AGENT_PACKAGE_VERSION="8.16.0" SNAPSHOT=true EXTERNAL=true PACKAGES=docker mage -v package
-AGENT_VERSION="8.16.0-SNAPSHOT" TEST_INTEG_CLEAN_ON_EXIT=true INSTANCE_PROVISIONER=kind STACK_PROVISIONER=stateful SNAPSHOT=true mage integration:kubernetesMatrix
->>>>>>> c9cd580456 (Fix like https://github.com/elastic/beats/issues/41270 (#5868))
+AGENT_VERSION="8.16.0-SNAPSHOT" AGENT_STACK_VERSION="8.16.0-SNAPSHOT" TEST_INTEG_CLEAN_ON_EXIT=true INSTANCE_PROVISIONER=kind STACK_PROVISIONER=stateful SNAPSHOT=true mage integration:kubernetesMatrix
 TESTS_EXIT_STATUS=$?
 set -e