diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc
index fa7176ac21fe..8e5cc8488a70 100644
--- a/libbeat/docs/version.asciidoc
+++ b/libbeat/docs/version.asciidoc
@@ -1,12 +1,6 @@
-<<<<<<< HEAD
 :stack-version: 8.14.1
 :doc-branch: 8.14
-:go-version: 1.21.10
-=======
-:stack-version: 8.15.0
-:doc-branch: main
 :go-version: 1.21.11
->>>>>>> b5155a177e ([Automation] Bump Golang version to 1.21.11 (#39851))
 :release-state: unreleased
 :python: 3.7
 :docker: 1.12