From d1a243c47fe8f6e866520c830ec2f4134958d1c1 Mon Sep 17 00:00:00 2001
From: Julien Lind <julien.lind@elastic.co>
Date: Mon, 9 Oct 2023 16:00:20 +0200
Subject: [PATCH] Update Dockerfile

---
 dev-tools/packaging/templates/ironbank/filebeat/Dockerfile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dev-tools/packaging/templates/ironbank/filebeat/Dockerfile b/dev-tools/packaging/templates/ironbank/filebeat/Dockerfile
index 3280897d6d4..99eeed7d53c 100644
--- a/dev-tools/packaging/templates/ironbank/filebeat/Dockerfile
+++ b/dev-tools/packaging/templates/ironbank/filebeat/Dockerfile
@@ -4,11 +4,7 @@
 ################################################################################
 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