fix conflicts

Author: greg-lindsay

articles/application-gateway/for-containers/application-gateway-for-containers-components.md

@@ -1,10 +1,5 @@
 ---
-
-<<<<<<< HEAD
-title: Application Gateway for Containers components 
-=======
 title: Application Gateway for Containers components
->>>>>>> b22bb31438e591c51c975b3532e52cf2e3024d76
 description: This article provides information about how Application Gateway for Containers accepts incoming requests and routes them to a backend target.
 services: application-gateway
 author: greglin
@@ -15,11 +10,7 @@ ms.date: 02/27/2024
 ms.author: greglin
 ---
 
-<<<<<<< HEAD
-# Application Gateway for Containers components 
-=======
 # Application Gateway for Containers components
->>>>>>> b22bb31438e591c51c975b3532e52cf2e3024d76
 
 This article provides detailed descriptions and requirements for components of Application Gateway for Containers. Information about how Application Gateway for Containers accepts incoming requests and routes them to a backend target is provided.  For a general overview of Application Gateway for Containers, see [What is Application Gateway for Containers](overview.md).
 

articles/application-gateway/for-containers/how-to-url-rewrite-ingress-api.md

@@ -10,11 +10,7 @@ ms.date: 02/27/2024
 ms.author: greglin
 ---
 
-<<<<<<< HEAD
-# URL Rewrite for Azure Application Gateway for Containers - Ingress API 
-=======
 # URL Rewrite for Azure Application Gateway for Containers - Ingress API
->>>>>>> b22bb31438e591c51c975b3532e52cf2e3024d76
 
 Application Gateway for Containers allows you to rewrite the URL of a client request, including the requests' hostname and/or path.  When Application Gateway for Containers initiates the request to the backend target, the request contains the newly rewritten URL to initiate the request.
 

articles/application-gateway/for-containers/overview.md

@@ -1,9 +1,5 @@
 ---
-<<<<<<< HEAD
-title: What is Application Gateway for Containers? 
-=======
 title: What is Application Gateway for Containers?
->>>>>>> b22bb31438e591c51c975b3532e52cf2e3024d76
 description: Overview of Azure Application Load Balancer Application Gateway for Containers features, resources, architecture, and implementation. Learn how Application Gateway for Containers works and how to use Application Gateway for Containers resources in Azure.
 services: application-gateway
 author: greglin
@@ -15,19 +11,11 @@ ms.date: 02/27/2024
 ms.author: greglin
 ---
 
-<<<<<<< HEAD
-# What is Application Gateway for Containers? 
-=======
 # What is Application Gateway for Containers?
->>>>>>> b22bb31438e591c51c975b3532e52cf2e3024d76
 
 Application Gateway for Containers is a new application (layer 7) [load balancing](/azure/architecture/guide/technology-choices/load-balancing-overview) and dynamic traffic management product for workloads running in a Kubernetes cluster. It extends Azure's Application Load Balancing portfolio and is a new offering under the Application Gateway product family.
 
-<<<<<<< HEAD
-Application Gateway for Containers is the evolution of the [Application Gateway Ingress Controller](../ingress-controller-overview.md) (AGIC), a [Kubernetes](/azure/aks) application that enables Azure Kubernetes Service (AKS) customers to use Azure's native Application Gateway application load-balancer. In its current form, AGIC monitors a subset of Kubernetes Resources for changes and applies them to the Application Gateway, utilizing Azure Resource Manager (ARM). 
-=======
 Application Gateway for Containers is the evolution of the [Application Gateway Ingress Controller](../ingress-controller-overview.md) (AGIC), a [Kubernetes](/azure/aks) application that enables Azure Kubernetes Service (AKS) customers to use Azure's native Application Gateway application load-balancer. In its current form, AGIC monitors a subset of Kubernetes Resources for changes and applies them to the Application Gateway, utilizing Azure Resource Manager (ARM).
->>>>>>> b22bb31438e591c51c975b3532e52cf2e3024d76
 
 ## How does it work?
 

articles/application-gateway/for-containers/quickstart-deploy-application-gateway-for-containers-alb-controller.md

@@ -58,11 +58,7 @@ You need to complete the following tasks prior to deploying Application Gateway
     ```azurecli-interactive
     AKS_NAME='<your cluster name>'
     RESOURCE_GROUP='<your resource group name>'
-<<<<<<< HEAD
-    LOCATION='northeurope' # The list of available regions may grow as we roll out to more regions
-=======
     LOCATION='northeurope'
->>>>>>> b22bb31438e591c51c975b3532e52cf2e3024d76
     VM_SIZE='<the size of the vm in AKS>' # The size needs to be available in your location
 
     az group create --name $RESOURCE_GROUP --location $LOCATION