Update hardening_manifest.yaml

Author: kruskall

packaging/ironbank/hardening_manifest.yaml

@@ -13,13 +13,8 @@ tags:
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "redhat/ubi/ubi9"
-<<<<<<< HEAD
-  BASE_TAG: "9.6"
-  ELASTIC_STACK: "{{ beat_version }}"
-=======
   BASE_TAG: "9.7"
-  ELASTIC_STACK: "${APM_SERVER_VERSION}"
->>>>>>> 154b8060 (deps: Bump ironbank version to 9.7 (#19558))
+  ELASTIC_STACK: "{{ beat_version }}"
   ELASTIC_PRODUCT: "apm-server"
 
 # Docker image labels