diff --git a/docs/en/install-upgrade/breaking.asciidoc b/docs/en/install-upgrade/breaking.asciidoc
index 2ba76b6d7..2dfe4690b 100644
--- a/docs/en/install-upgrade/breaking.asciidoc
+++ b/docs/en/install-upgrade/breaking.asciidoc
@@ -31,7 +31,11 @@ Upgrade Assistant provides information about which {dfeeds} need to be updated.
 This list summarizes the most important breaking changes in APM.
 For the complete list, go to {apm-guide-ref}/apm-breaking.html[APM breaking changes].
 
+<<<<<<< HEAD
 include::{apm-repo-dir}/apm-breaking.asciidoc[tag=717-bc]
+=======
+// include::{apm-repo-dir}/apm-breaking.asciidoc[tag=notable-v8-breaking-changes]
+>>>>>>> 413a91f5 (docs: temp comment out include (#2626))
 
 [[beats-breaking-changes]]
 === Beats breaking changes
diff --git a/docs/en/install-upgrade/index.asciidoc b/docs/en/install-upgrade/index.asciidoc
index e2dbddc65..53d5d319c 100644
--- a/docs/en/install-upgrade/index.asciidoc
+++ b/docs/en/install-upgrade/index.asciidoc
@@ -1,7 +1,7 @@
 [[elastic-stack]]
 = Installation and Upgrade Guide
 
-:apm-repo-dir:       {apm-server-root}/docs
+:apm-repo-dir:       {apm-server-root}/changelogs
 :beats-repo-dir:     {beats-root}/libbeat/docs
 :es-repo-dir:        {elasticsearch-root}/docs/reference
 :hadoop-repo-dir:    {elasticsearch-hadoop-root}/docs/src/reference/asciidoc