Fix conflicts.

auditbeat/module/file_integrity/config_test.go

@@ -55,12 +55,7 @@ func TestConfig(t *testing.T) {
 	assert.EqualValues(t, `(?-m:\.DS_Store$)`, c.ExcludeFiles[0].String())
 	assert.EqualValues(t, `(?-m:\.swp$)`, c.ExcludeFiles[1].String())
 	assert.Len(t, c.IncludeFiles, 1)
-<<<<<<< HEAD
-	assert.EqualValues(t, `\.ssh/(?-m:$)`, c.IncludeFiles[0].String())
-=======
 	assert.EqualValues(t, `(?-m:\.ssh/$)`, c.IncludeFiles[0].String())
-	assert.Len(t, c.FileParsers, 2)
->>>>>>> c0f8ae3b25 (Update to Go 1.22.5 (#40082))
 }
 
 func TestConfigInvalid(t *testing.T) {

dev-tools/mage/crossbuild.go

@@ -309,22 +309,6 @@ func (b GolangCrossBuilder) Build() error {
 		"--env", fmt.Sprintf("DEV=%v", DevBuild),
 		"-v", repoInfo.RootDir+":"+mountPoint,
 		"-w", workDir,
-<<<<<<< HEAD
-=======
-	)
-
-	// Ensure the proper platform is passed
-	// This fixes an issue where during arm64 linux build for the currently used docker image
-	// docker.elastic.co/beats-dev/golang-crossbuild:1.22.5-arm the image for amd64 arch is pulled
-	// and causes problems when using native arch tools on the binaries that are built for arm64 arch.
-	if strings.HasPrefix(b.Platform, "linux/") {
-		args = append(args,
-			"--platform", b.Platform,
-		)
-	}
-
-	args = append(args,
->>>>>>> c0f8ae3b25 (Update to Go 1.22.5 (#40082))
 		image,
 		"--build-cmd", buildCmd+" "+b.Target,
 		"-p", b.Platform,

go.mod

@@ -1,10 +1,6 @@
 module github.com/elastic/beats/v7
 
-<<<<<<< HEAD
-go 1.21
-=======
 go 1.22.5
->>>>>>> c0f8ae3b25 (Update to Go 1.22.5 (#40082))
 
 require (
 	cloud.google.com/go/bigquery v1.52.0

libbeat/docs/version.asciidoc

@@ -1,12 +1,6 @@
-<<<<<<< HEAD
 :stack-version: 7.17.22
 :doc-branch: 7.17
-:go-version: 1.21.12
-=======
-:stack-version: 8.15.0
-:doc-branch: main
 :go-version: 1.22.5
->>>>>>> c0f8ae3b25 (Update to Go 1.22.5 (#40082))
 :release-state: unreleased
 :python: 3.7
 :docker: 1.12

metricbeat/Dockerfile

@@ -1,10 +1,5 @@
-<<<<<<< HEAD
-FROM golang:1.21.12
-COPY --from=docker:26.0.0-alpine3.19 /usr/local/bin/docker /usr/local/bin/
-=======
 FROM golang:1.22.5
 COPY --from=docker:26.0.0-alpine3.19 /usr/local/bin/docker  /usr/local/bin/
->>>>>>> c0f8ae3b25 (Update to Go 1.22.5 (#40082))
 
 RUN \
     apt update \