Resolved conflicts

Author: pazone

pkg/testing/ess/create_deployment_csp_configuration.yaml

@@ -13,11 +13,8 @@ aws:
   elasticsearch_conf_id: "aws.es.datahot.i3"
   elasticsearch_deployment_template_id: "aws-storage-optimized"
   kibana_instance_configuration_id: "aws.kibana.c5d"
-<<<<<<< HEAD
-=======
 # Automatically updated by updatecli-bump-stack-version.yml. Don't change the structure and key names
 docker:
   integration_server_image: "docker.elastic.co/cloud-release/elastic-agent-cloud:9.1.0-48398db3-SNAPSHOT"
   elasticsearch_image: "docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.1.0-48398db3-SNAPSHOT"
   kibana_image: "docker.elastic.co/cloud-release/kibana-cloud:9.1.0-48398db3-SNAPSHOT"
->>>>>>> e728b39b5 ([CI] Stable stack version override (#8352))