diff --git a/src/main/docker/Dockerfile.jvm b/src/main/docker/Dockerfile.jvm
index 2cc1c002e..e0f2a3678 100644
--- a/src/main/docker/Dockerfile.jvm
+++ b/src/main/docker/Dockerfile.jvm
@@ -77,11 +77,7 @@
 #   accessed directly. (example: "foo.example.com,bar.example.com")
 #
 ###
-<<<<<<< HEAD
-FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.21-1.1737580425
-=======
 FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.21-1.1739376167
->>>>>>> f0e9e12 (build(deps): bump ubi9/openjdk-21-runtime from 1.21-1.1738663155 to 1.21-1.1739376167 in /src/main/docker (#809))
 
 ENV LANGUAGE='en_US:en'