Fix conflicts

.github/workflows/benchmarks.yml

@@ -44,11 +44,8 @@ jobs:
       SSH_KEY: ./id_rsa_terraform
       TF_VAR_private_key: ./id_rsa_terraform
       TF_VAR_public_key: ./id_rsa_terraform.pub
-<<<<<<< HEAD
-=======
       TF_VAR_run_standalone: ${{ inputs.runStandalone || github.event.schedule=='0 5 */5 * *' }}
       RUN_STANDALONE: ${{ inputs.runStandalone || github.event.schedule=='0 5 */5 * *' }}
->>>>>>> 9499f3dea (ci: fix benchmarks cleanup (#14334))
       TFVARS_SOURCE: ${{ inputs.profile || 'system-profiles/8GBx1zone.tfvars' }} # // Default to use an 8gb profile
       TF_VAR_BUILD_ID: ${{ github.run_id }}
       TF_VAR_ENVIRONMENT: ci
@@ -120,10 +117,7 @@ jobs:
           admin_console_url=$(terraform output -raw admin_console_url)
           echo "admin_console_url=$admin_console_url" >> "$GITHUB_OUTPUT"
           echo "-> infra setup done"
-<<<<<<< HEAD
 
-=======
->>>>>>> 9499f3dea (ci: fix benchmarks cleanup (#14334))
       - name: Run benchmarks autotuned
         if: ${{ inputs.benchmarkAgents == '' }}
         run: make run-benchmark-autotuned index-benchmark-results
@@ -164,8 +158,6 @@ jobs:
           path: ${{ env.WORKING_DIRECTORY }}/${{ env.BENCHMARK_RESULT }}
           if-no-files-found: error
 
-<<<<<<< HEAD
-=======
       # The next section injects CPU profile collected by apmbench into the build.
       # By copying the profile, uploading it to the artifacts and pushing it
       # via a PR to update default.pgo.
@@ -228,7 +220,6 @@ jobs:
           secrets: |-
             EC_API_KEY:elastic-observability/elastic-cloud-observability-team-pro-api-key
 
->>>>>>> 9499f3dea (ci: fix benchmarks cleanup (#14334))
       - name: Tear down benchmark environment
         if: always()
         run: make destroy