RHIDP-1923 - GKE: Document how RHDH can be installed in GKE

Author: Gerry-Forde

assemblies/assembly-rhdh-integration-aks.adoc

@@ -13,15 +13,4 @@ This integration requires the deployment of {product-short} on {aks-short} using
 * The Helm chart
 * The {product} Operator
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-//include::modules/admin/proc-rhdh-monitoring-logging-aks.adoc[leveloffset=+1] // moving observe category related content to new titles: RHIDP-4814
-=======
-.Additional resources
-* link:{authentication-book-url}#assembly-authenticating-with-microsoft-azure[Authenticating with {azure-brand-name}]
-
-include::modules/admin/proc-rhdh-monitoring-logging-aks.adoc[leveloffset=+1]
->>>>>>> f5f4208 (RHIDP-4860 Remove Azure authentication provider from admin guide (#690))
-=======
-//include::modules/admin/proc-rhdh-monitoring-logging-aks.adoc[leveloffset=+1] // moving observe category related content to new titles: RHIDP-4814
->>>>>>> c10a907 (RHIDP-4814: Move observe related content to new titles (#689))
+//include::modules/admin/proc-rhdh-monitoring-logging-aks.adoc[leveloffset=+1] // moving observe category related content to new titles: RHIDP-4814