docs: temp comment out include (elastic#2626)

(cherry picked from commit 413a91f)

# Conflicts:
#	docs/en/install-upgrade/breaking.asciidoc

Author: bmorelli25

docs/en/install-upgrade/breaking.asciidoc

@@ -33,7 +33,7 @@ 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].
 
-include::{apm-repo-dir}/apm-breaking.asciidoc[tag=notable-v8-breaking-changes]
+// include::{apm-repo-dir}/apm-breaking.asciidoc[tag=notable-v8-breaking-changes]
 
 [[beats-breaking-changes]]
 === Beats breaking changes
@@ -69,7 +69,11 @@ include::{es-repo-dir}/migration/migrate_8_6.asciidoc[tag=notable-breaking-chang
 This list summarizes the most important breaking changes in {elastic-sec} {version}. For
 the complete list, go to {security-guide-all}/8.6/release-notes-header-8.6.0.html#breaking-changes-8.6.0[{elastic-sec} breaking changes].
 
+<<<<<<< HEAD
 include::{security-repo-dir}/release-notes/8.6.asciidoc[tag=breaking-changes] 
+=======
+include::{security-repo-dir}/release-notes/8.8.asciidoc[tag=breaking-changes]
+>>>>>>> 413a91f5 (docs: temp comment out include (#2626))
 
 [[kibana-breaking-changes]]
 === {kib} breaking changes

docs/en/install-upgrade/index.asciidoc

@@ -1,7 +1,7 @@
 [[elastic-stack]]
 = Elastic 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