Edits

Author: schaffererin

articles/aks/limit-egress-traffic.md

@@ -74,25 +74,13 @@ Provision a virtual network with two separate subnets: one for the cluster and o
 
     ```azurecli
     # Dedicated virtual network with AKS subnet
-<<<<<<< HEAD
-
-<<<<<<< HEAD
-=======
->>>>>>> 5e9ad6d2eb44aafc705156cb108dfcd910c93e9b
     az network vnet create \
         --resource-group $RG \
         --name $VNET_NAME \
         --location $LOC \
         --address-prefixes 10.42.0.0/16 \
         --subnet-name $AKSSUBNET_NAME \
         --subnet-prefix 10.42.1.0/24
-<<<<<<< HEAD
-=======
-```azurecli
-# Dedicated virtual network with AKS subnet
->>>>>>> 3fd8d1fba64a42875809635a5dd59df79e769e09
-=======
->>>>>>> 5e9ad6d2eb44aafc705156cb108dfcd910c93e9b
 
     # Dedicated subnet for Azure Firewall (Firewall name can't be changed)
     az network vnet subnet create \
@@ -330,17 +318,7 @@ If you used authorized IP ranges for your cluster in the previous step, you need
     CURRENT_IP=$(dig @resolver1.opendns.com ANY myip.opendns.com +short)
     ```
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-2. Add the IP address to the approved ranges using the [`az aks update`][az-aks-update] command.
-=======
-```azurecli
-# Retrieve your IP address
-CURRENT_IP=$(dig @resolver1.opendns.com ANY myip.opendns.com +short)
->>>>>>> 3fd8d1fba64a42875809635a5dd59df79e769e09
-=======
 2. Add the IP address to the approved ranges using the [`az aks update`][az-aks-update] command.
->>>>>>> 5e9ad6d2eb44aafc705156cb108dfcd910c93e9b
 
     ```azurecli
     az aks update -g $RG -n $AKSNAME --api-server-authorized-ip-ranges $CURRENT_IP/32