diff --git a/dev-tools/packaging/templates/ironbank/packetbeat/Dockerfile b/dev-tools/packaging/templates/ironbank/packetbeat/Dockerfile
index 6cc209e17df..9517b3d4c09 100644
--- a/dev-tools/packaging/templates/ironbank/packetbeat/Dockerfile
+++ b/dev-tools/packaging/templates/ironbank/packetbeat/Dockerfile
@@ -4,11 +4,8 @@
 ################################################################################
 ARG BASE_REGISTRY=registry1.dsop.io
 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
-<<<<<<< HEAD
-ARG BASE_TAG=8.7
-=======
 ARG BASE_TAG=9.2
->>>>>>> 239357688c (change base image to ubi 9.2 (#36797))
+
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as builder