diff --git a/.circleci/config.yml b/.circleci/config.yml
index 606ae2ef1..79e2c1447 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -205,7 +205,7 @@ jobs:
       BUILD_ARGS: << parameters.build-args >>
       MAKE_TARGETS: << parameters.make-targets >>
       DEPLOY_BRANCH: trunk
-      RELEASE: selenium-4.18.1
+      RELEASE: selenium-4.18.0
       SELENIUM_VERSION: 4.18.1
       GITHUB_USER: seleniumhq-community
       GITHUB_REPO: docker-seleniarm
diff --git a/Makefile b/Makefile
index e2368bfef..618f10073 100644
--- a/Makefile
+++ b/Makefile
@@ -506,8 +506,6 @@ test_firefox:
 test_firefox_standalone:
 	VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh StandaloneFirefox
 
-<<<<<<< HEAD
-
 # Test multi-arch container images
 test_multi_arch: test_chromium_multi \
  test_firefox_multi \
@@ -527,7 +525,6 @@ test_firefox_multi:
 test_firefox_standalone_multi:
 	VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh StandaloneFirefox
 
-=======
 test_parallel: hub chrome firefox edge
 	for node in DeploymentAutoscaling JobAutoscaling ; do \
 			cd ./tests || true ; \
@@ -540,7 +537,6 @@ test_parallel: hub chrome firefox edge
 			echo UID=$$(id -u) >> .env ; \
 			docker-compose -f docker-compose-v3-test-parallel.yml up --no-log-prefix --exit-code-from tests --build ; \
 	done
->>>>>>> origin/4.18.1
 
 # This should run on its own CI job. There is no need to combine it with the other tests.
 # Its main purpose is to check that a video file was generated.