diff --git a/.go-version b/.go-version
index 663b0d0de02..e63679c7661 100644
--- a/.go-version
+++ b/.go-version
@@ -1,5 +1 @@
-<<<<<<< HEAD
-1.19.12
-=======
 1.20.6
->>>>>>> a278734f11 (upgrade Go to 1.20.6 (#36000))
diff --git a/.golangci.yml b/.golangci.yml
index cfa2e41ab79..2d350878de9 100755
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -102,11 +102,7 @@ linters-settings:
 
   gosimple:
     # Select the Go version to target. The default is '1.13'.
-<<<<<<< HEAD
-    go: "1.19.12"
-=======
     go: "1.20.6"
->>>>>>> a278734f11 (upgrade Go to 1.20.6 (#36000))
 
   nakedret:
     # make an issue if func has more lines of code than this setting and it has naked returns; default is 30
@@ -124,31 +120,19 @@ linters-settings:
 
   staticcheck:
     # Select the Go version to target. The default is '1.13'.
-<<<<<<< HEAD
-    go: "1.19.12"
-=======
     go: "1.20.6"
->>>>>>> a278734f11 (upgrade Go to 1.20.6 (#36000))
     checks: ["all"]
 
   stylecheck:
     # Select the Go version to target. The default is '1.13'.
-<<<<<<< HEAD
-    go: "1.19.12"
-=======
     go: "1.20.6"
->>>>>>> a278734f11 (upgrade Go to 1.20.6 (#36000))
     # Disabled:
     # ST1005: error strings should not be capitalized
     checks: ["all", "-ST1005"]
 
   unused:
     # Select the Go version to target. The default is '1.13'.
-<<<<<<< HEAD
-    go: "1.19.12"
-=======
     go: "1.20.6"
->>>>>>> a278734f11 (upgrade Go to 1.20.6 (#36000))
 
   gosec:
     excludes:
@@ -157,20 +141,3 @@ linters-settings:
     - G401 # Detect the usage of DES, RC4, MD5 or SHA1: Used in non-crypto contexts.
     - G501 # Import blocklist: crypto/md5: Used in non-crypto contexts.
     - G505 # Import blocklist: crypto/sha1: Used in non-crypto contexts.
-<<<<<<< HEAD
-=======
-
-  prealloc:
-    # IMPORTANT: we don't recommend using this linter before doing performance profiling.
-    # For most programs usage of prealloc will be a premature optimization.
-
-    # Report pre-allocation suggestions only on simple loops that have no returns/breaks/continues/gotos in them.
-    # Default: true
-    simple: false
-    # Report pre-allocation suggestions on range loops.
-    # Default: true
-    range-loops: true
-    # Report pre-allocation suggestions on for loops.
-    # Default: false
-    for-loops: true
->>>>>>> a278734f11 (upgrade Go to 1.20.6 (#36000))
diff --git a/Vagrantfile b/Vagrantfile
index 68694601993..057e9044bca 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -320,7 +320,6 @@ Vagrant.configure("2") do |config|
     c.vm.provision "shell", inline: $unixProvision, privileged: false
   end
 
-<<<<<<< HEAD
   config.vm.define "archlinux", autostart: false do |c|
     c.vm.box = "archlinux/archlinux"
     c.vm.network :forwarded_port, guest: 22, host: 2239, id: "ssh", auto_correct: true
@@ -329,50 +328,4 @@ Vagrant.configure("2") do |config|
     c.vm.provision "shell", inline: linuxGvmProvision, privileged: false
     c.vm.provision "shell", inline: "pacman -Sy && pacman -S --noconfirm make gcc python python-pip git"
   end
-=======
-    config.vm.define "beats" do |nodeconfig|
-      nodeconfig.vm.box = "ubuntu/jammy64"
-
-      # We deliberately set a fully-qualified domain name for the VM; it helps
-      # test the FQDN feature flag.
-      nodeconfig.vm.hostname = "beats-dev.elastic.dev.internal"
-
-      nodeconfig.vm.network "private_network",
-        hostname: true,
-        ip: "192.168.56.44" # only 192.168.56.0/21 range allowed: https://www.virtualbox.org/manual/ch06.html#network_hostonly
-      nodeconfig.vm.network "forwarded_port",
-        guest: 4244,
-        host: 4244,
-        id: "delve"
-
-      nodeconfig.vm.provider "virtualbox" do |vb|
-        # Display the VirtualBox GUI when booting the machine
-        vb.gui = false
-        vb.customize ["modifyvm", :id, "--vram", "128"]
-        # Customize the amount of memory on the VM:
-        vb.memory = "4096"
-      end
-
-      nodeconfig.vm.provision "shell", inline: <<-SHELL
-         apt-get update
-         apt-get install -y \
-          build-essential \
-          curl \
-          delve \
-          make \
-          unzip
-          vim \
-          wget
-         curl -sL -o /tmp/go#{GO_VERSION}.linux-amd64.tar.gz https://go.dev/dl/go#{GO_VERSION}.linux-amd64.tar.gz
-         tar -C /usr/local -xzf /tmp/go#{GO_VERSION}.linux-amd64.tar.gz
-         curl -sL -o /tmp/mage_1.15.0_Linux-64bit.tar.gz https://github.com/magefile/mage/releases/download/v1.15.0/mage_1.15.0_Linux-64bit.tar.gz
-         tar -C /tmp -xf /tmp/mage_1.15.0_Linux-64bit.tar.gz
-         mv /tmp/mage /usr/local/bin/mage
-         echo "alias ll='ls -la'" > /etc/profile.d/ll.sh
-         echo 'export PATH=$PATH:/usr/local/go/bin' > /etc/profile.d/go.sh
-         echo 'export PATH=$PATH:$(go env GOPATH)/bin' >> /etc/profile.d/go.sh
-      SHELL
-    end
-
->>>>>>> a278734f11 (upgrade Go to 1.20.6 (#36000))
 end
diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile
index 8338206bbe5..d3390a85517 100644
--- a/auditbeat/Dockerfile
+++ b/auditbeat/Dockerfile
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-FROM golang:1.19.12
-=======
 FROM golang:1.20.6
->>>>>>> a278734f11 (upgrade Go to 1.20.6 (#36000))
 
 RUN \
     apt-get update \
diff --git a/dev-tools/mage/gotest.go b/dev-tools/mage/gotest.go
index 1648159abb0..c21ac3eaa89 100644
--- a/dev-tools/mage/gotest.go
+++ b/dev-tools/mage/gotest.go
@@ -302,14 +302,9 @@ func GoTest(ctx context.Context, params GoTestArgs) error {
 		coverToHTML := sh.RunCmd("go", "tool", "cover",
 			"-html="+params.CoverageProfileFile,
 			"-o", htmlCoverReport)
-<<<<<<< HEAD
-		if err = coverToHTML(); err != nil {
-			return errors.Wrap(err, "failed to write HTML code coverage report")
-=======
 
 		if err := coverToHTML(); err != nil {
 			return fmt.Errorf("failed to write HTML code coverage report: %w", err)
->>>>>>> a278734f11 (upgrade Go to 1.20.6 (#36000))
 		}
 	}
 
diff --git a/filebeat/input/syslog/rfc5424_parser.go b/filebeat/input/syslog/rfc5424_parser.go
index a3bb182a169..758bf4843b5 100644
--- a/filebeat/input/syslog/rfc5424_parser.go
+++ b/filebeat/input/syslog/rfc5424_parser.go
@@ -8910,29 +8910,6 @@ func ParserRFC5424(data []byte, event *event) {
 			goto st571
 		}
 		goto st0
-<<<<<<< HEAD
-=======
-	tr580:
-		// line-disable-directive parser/common.rl:39
-
-		event.SetSecond(data[tok:p])
-
-		// line-disable-directive parser/common.rl:3
-
-		tok = p
-
-		goto st571
-	tr590:
-		// line-disable-directive parser/common.rl:43
-
-		event.SetNanosecond(data[tok:p])
-
-		// line-disable-directive parser/common.rl:3
-
-		tok = p
-
-		goto st571
->>>>>>> a278734f11 (upgrade Go to 1.20.6 (#36000))
 	st571:
 		if (p)++; (p) == (pe) {
 			goto _test_eof571
diff --git a/heartbeat/Dockerfile b/heartbeat/Dockerfile
index 702a77dea40..776d8290f7d 100644
--- a/heartbeat/Dockerfile
+++ b/heartbeat/Dockerfile
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-FROM golang:1.19.12
-=======
 FROM golang:1.20.6
->>>>>>> a278734f11 (upgrade Go to 1.20.6 (#36000))
 
 RUN \
     apt-get update \
diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc
index e20c86a9ff8..1e68e4ba918 100644
--- a/libbeat/docs/version.asciidoc
+++ b/libbeat/docs/version.asciidoc
@@ -1,12 +1,6 @@
-<<<<<<< HEAD
 :stack-version: 7.17.14
 :doc-branch: 7.17
-:go-version: 1.19.12
-=======
-:stack-version: 8.10.0
-:doc-branch: main
 :go-version: 1.20.6
->>>>>>> a278734f11 (upgrade Go to 1.20.6 (#36000))
 :release-state: unreleased
 :python: 3.7
 :docker: 1.12
diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile
index 595ecd9dffa..5f57c931a0a 100644
--- a/metricbeat/Dockerfile
+++ b/metricbeat/Dockerfile
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-FROM golang:1.19.12
-=======
 FROM golang:1.20.6
->>>>>>> a278734f11 (upgrade Go to 1.20.6 (#36000))
 
 RUN \
     apt update \
diff --git a/metricbeat/module/http/_meta/Dockerfile b/metricbeat/module/http/_meta/Dockerfile
index a9e20de6973..1ddf090399b 100644
--- a/metricbeat/module/http/_meta/Dockerfile
+++ b/metricbeat/module/http/_meta/Dockerfile
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-FROM golang:1.19.12
-=======
 FROM golang:1.20.6
->>>>>>> a278734f11 (upgrade Go to 1.20.6 (#36000))
 
 COPY test/main.go main.go
 
diff --git a/metricbeat/module/nats/_meta/Dockerfile b/metricbeat/module/nats/_meta/Dockerfile
index ee0267a54e7..a12879d2804 100644
--- a/metricbeat/module/nats/_meta/Dockerfile
+++ b/metricbeat/module/nats/_meta/Dockerfile
@@ -2,11 +2,7 @@ ARG NATS_VERSION=2.0.4
 FROM nats:$NATS_VERSION
 
 # build stage
-<<<<<<< HEAD
-FROM golang:1.19.12 AS build-env
-=======
 FROM golang:1.20.6 AS build-env
->>>>>>> a278734f11 (upgrade Go to 1.20.6 (#36000))
 RUN apt-get install git mercurial gcc
 RUN git clone https://github.com/nats-io/nats.go.git /nats-go
 RUN cd /nats-go/examples/nats-bench && git checkout tags/v1.10.0 && go build .
diff --git a/packetbeat/Dockerfile b/packetbeat/Dockerfile
index dcae5828e39..74490244201 100644
--- a/packetbeat/Dockerfile
+++ b/packetbeat/Dockerfile
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-FROM golang:1.19.12
-=======
 FROM golang:1.20.6
->>>>>>> a278734f11 (upgrade Go to 1.20.6 (#36000))
 
 RUN \
     apt-get update \
diff --git a/x-pack/functionbeat/Dockerfile b/x-pack/functionbeat/Dockerfile
index 13a4d7b12c3..8de2b067034 100644
--- a/x-pack/functionbeat/Dockerfile
+++ b/x-pack/functionbeat/Dockerfile
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-FROM golang:1.19.12
-=======
 FROM golang:1.20.6
->>>>>>> a278734f11 (upgrade Go to 1.20.6 (#36000))
 
 RUN \
     apt-get update \
diff --git a/x-pack/metricbeat/module/stan/_meta/Dockerfile b/x-pack/metricbeat/module/stan/_meta/Dockerfile
index aab2418a941..acee2d22c09 100644
--- a/x-pack/metricbeat/module/stan/_meta/Dockerfile
+++ b/x-pack/metricbeat/module/stan/_meta/Dockerfile
@@ -2,11 +2,7 @@ ARG STAN_VERSION=0.15.1
 FROM nats-streaming:$STAN_VERSION
 
 # build stage
-<<<<<<< HEAD
-FROM golang:1.19.12 AS build-env
-=======
 FROM golang:1.20.6 AS build-env
->>>>>>> a278734f11 (upgrade Go to 1.20.6 (#36000))
 RUN apt-get install git mercurial gcc
 RUN git clone https://github.com/nats-io/stan.go.git /stan-go
 RUN cd /stan-go/examples/stan-bench && git checkout tags/v0.5.2 && go build .