fix: resolve merge conflicts in backport of #51345

Mergify left unresolved conflict markers in three Buildkite pipeline
files. Resolve by keeping 9.3's image versions (1782878510) and
dropping IMAGE_UBUNTU_X86_64_FIPS, which no step references after the
switch to native Go FIPS (GOFIPS140=v1.0.0).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: macdewee

.buildkite/libbeat/pipeline.libbeat.yml

@@ -11,21 +11,12 @@ env:
   IMAGE_UBUNTU_X86_64: "platform-ingest-beats-ubuntu-2204-1782878510"
   IMAGE_WIN_10: "platform-ingest-beats-windows-10-pro"
   IMAGE_WIN_11: "platform-ingest-beats-windows-11-pro"
-<<<<<<< HEAD
   IMAGE_WIN_10_VERSION: "1.0.1782878510"
   IMAGE_WIN_11_VERSION: "1.0.1782878510"
   IMAGE_WIN_2016: "platform-ingest-beats-windows-2016-1782878510"
   IMAGE_WIN_2019: "platform-ingest-beats-windows-2019-1782878510"
   IMAGE_WIN_2022: "platform-ingest-beats-windows-2022-1782878510"
-  IMAGE_UBUNTU_X86_64_FIPS: "platform-ingest-beats-ubuntu-2204-fips-1782878510"
 
-=======
-  IMAGE_WIN_10_VERSION: "1.0.1781496166"
-  IMAGE_WIN_11_VERSION: "1.0.1781496166"
-  IMAGE_WIN_2016: "platform-ingest-beats-windows-2016-1781496166"
-  IMAGE_WIN_2019: "platform-ingest-beats-windows-2019-1781496166"
-  IMAGE_WIN_2022: "platform-ingest-beats-windows-2022-1781496166"
->>>>>>> a829d56a0 (Use native Go for Linux FIPS builds (#51345))
   IMAGE_BEATS_WITH_HOOKS_LATEST: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest"
 
   #Deps

.buildkite/x-pack/pipeline.xpack.filebeat.yml

@@ -9,12 +9,7 @@ env:
   GCP_HI_PERF_MACHINE_TYPE: "c2d-highcpu-16"
   GCP_WIN_MACHINE_TYPE: "n2-standard-8"
 
-<<<<<<< HEAD
   IMAGE_UBUNTU_X86_64: "platform-ingest-beats-ubuntu-2204-1782878510"
-  IMAGE_UBUNTU_X86_64_FIPS: "platform-ingest-beats-ubuntu-2204-fips-1782878510"
-=======
-  IMAGE_UBUNTU_X86_64: "platform-ingest-beats-ubuntu-2204-1781496166"
->>>>>>> a829d56a0 (Use native Go for Linux FIPS builds (#51345))
   IMAGE_WIN_10: "platform-ingest-beats-windows-10-pro"
   IMAGE_WIN_11: "platform-ingest-beats-windows-11-pro"
   IMAGE_WIN_10_VERSION: "1.0.1782878510"

.buildkite/x-pack/pipeline.xpack.metricbeat.yml

@@ -9,12 +9,7 @@ env:
   GCP_HI_PERF_MACHINE_TYPE: "c2d-highcpu-16"
   GCP_WIN_MACHINE_TYPE: "n2-standard-8"
 
-<<<<<<< HEAD
   IMAGE_UBUNTU_X86_64: "platform-ingest-beats-ubuntu-2204-1782878510"
-  IMAGE_UBUNTU_X86_64_FIPS: "platform-ingest-beats-ubuntu-2204-fips-1782878510"
-=======
-  IMAGE_UBUNTU_X86_64: "platform-ingest-beats-ubuntu-2204-1781496166"
->>>>>>> a829d56a0 (Use native Go for Linux FIPS builds (#51345))
   IMAGE_WIN_10: "platform-ingest-beats-windows-10-pro"
   IMAGE_WIN_11: "platform-ingest-beats-windows-11-pro"
   IMAGE_WIN_10_VERSION: "1.0.1782878510"