fixed OSM file warnings

Author: Phill Gibson

articles/aks/TOC.yml

@@ -390,8 +390,6 @@
                   href: open-service-mesh-nginx-ingress.md
                 - name: Configure observability using Prometheus, Grafana, and Jaeger
                   href: open-service-mesh-open-source-observability.md
-                - name: Customize OSM CLI experience
-                  href: open-service-mesh-customize-add-on-experience.md
                 - name: IP and port range exclusion
                   href: open-service-mesh-ip-port-exclusion.md
             - name: Configure Azure Monitor

articles/aks/open-service-mesh-binary.md

@@ -34,13 +34,6 @@ This article will discuss how to download the OSM client library to be used to o
 > [!WARNING]
 > Do not attempt to install OSM from the binary using `osm install`. This will result in a installation of OSM that is not integrated as an add-on for AKS.
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-> [!NOTE]
-> It is recommended to configure the OSM CLI to [customize the OSM AKS addon experience](./open-service-mesh-customize-add-on-experience.md) after installing the binary, before using the OSM CLI.
-=======
-=======
->>>>>>> 0968ce84f94b58536c68eb2e90711f68085ecdc0
 ## Configure OSM CLI variables with an OSM_CONFIG file
 
 Users can override the default OSM CLI configuration to enhance the add-on experience. This can be done by creating a config file, similar to `kubeconfig`. The config file can be either created at `$HOME/.osm/config.yaml`, or at a different path that is exported using the `OSM_CONFIG` environment variable.
@@ -66,16 +59,3 @@ install:
   distribution: AKS
   namespace: kube-system
 ```
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> a1ff20a5ca93 (OSM remove preview tags)
-=======
-
-> [!NOTE]
-> It is recommended to configure the OSM CLI to [customize the OSM AKS addon experience](./open-service-mesh-customize-add-on-experience.md) after installing the binary, before using the OSM CLI.
->>>>>>> 55a4c30f0002 (fixing merge conflicts)
-=======
->>>>>>> 0968ce84f94b (updated binary to remove redirection)
-=======
->>>>>>> 0968ce84f94b58536c68eb2e90711f68085ecdc0

articles/aks/open-service-mesh-deploy-addon-bicep.md

@@ -12,17 +12,7 @@ ms.author: pgibson
 
 This article will discuss how to deploy the OSM add-on to AKS using a [Bicep](../azure-resource-manager/bicep/index.yml) template.
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-[!INCLUDE [preview features callout](./includes/preview/preview-callout.md)]
-
-[Bicep](../azure-resource-manager/bicep/overview.md) is a domain-specific language (DSL) that uses declarative syntax to deploy Azure resources. Bicep can be used in place of creating Azure [ARM](../azure-resource-manager/templates/overview.md) templates for deploying your infrastructure-as-code Azure resources.
-=======
-[Bicep](/azure/azure-resource-manager/bicep/overview) is a domain-specific language (DSL) that uses declarative syntax to deploy Azure resources. Bicep can be used in place of creating Azure [ARM](/azure/azure-resource-manager/templates/overview) templates for deploying your infrastructure-as-code Azure resources.
->>>>>>> a1ff20a5ca93 (OSM remove preview tags)
-=======
 [Bicep](/azure/azure-resource-manager/bicep/overview) is a domain-specific language (DSL) that uses declarative syntax to deploy Azure resources. Bicep can be used in place of creating Azure [ARM](/azure/azure-resource-manager/templates/overview) templates for deploying your infrastructure-as-code Azure resources.
->>>>>>> 0968ce84f94b58536c68eb2e90711f68085ecdc0
 
 ## Prerequisites
 
@@ -288,4 +278,4 @@ az group delete --name osm-bicep-test
 [az-feature-list]: /cli/azure/feature#az_feature_list
 [az-provider-register]: /cli/azure/provider#az_provider_register
 [az-extension-add]: /cli/azure/extension#az_extension_add
-[az-extension-update]: /cli/azure/extension#az_extension_update
+[az-extension-update]: /cli/azure/extension#az_extension_update

articles/aks/open-service-mesh-troubleshoot.md

@@ -449,12 +449,4 @@ Information on how OSM issues and manages certificates to Envoy proxies running
 
 ### Upgrading Envoy
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 When a new pod is created in a namespace monitored by the add-on, OSM will inject an [envoy proxy sidecar](https://docs.openservicemesh.io/docs/guides/app_onboarding/sidecar_injection/) in that pod. Information regarding how to update the envoy version can be found in the [Upgrade Guide](https://release-v0-11.docs.openservicemesh.io/docs/getting_started/upgrade/#envoy) on the OpenServiceMesh docs site.
-=======
-When a new pod is created in a namespace monitored by the add-on, OSM will inject an [envoy proxy sidecar](https://docs.openservicemesh.io/docs/guides/app_onboarding/sidecar_injection/) in that pod. Information regarding how to update the envoy version can be found in the [Upgrade Guide](https://docs.openservicemesh.io/docs/getting_started/upgrade/#envoy) on the OpenServiceMesh docs site.
->>>>>>> a1ff20a5ca93 (OSM remove preview tags)
-=======
-When a new pod is created in a namespace monitored by the add-on, OSM will inject an [envoy proxy sidecar](https://docs.openservicemesh.io/docs/guides/app_onboarding/sidecar_injection/) in that pod. Information regarding how to update the envoy version can be found in the [Upgrade Guide](https://release-v0-11.docs.openservicemesh.io/docs/getting_started/upgrade/#envoy) on the OpenServiceMesh docs site.
->>>>>>> 55a4c30f0002 (fixing merge conflicts)