edit 2

Author: rmca14

articles/azure-linux/faq.md

@@ -11,12 +11,9 @@
 
 # Frequently asked questions about the Azure Linux Container Host for AKS
 
-<<<<<<< HEAD
-=======
 > [!CAUTION]
 > This article references CentOS, a Linux distribution that is End Of Life (EOL) status. Please consider your use and planning accordingly. For more information, see the [CentOS End Of Life guidance](/azure/virtual-machines/workloads/centos/centos-end-of-life).
 
->>>>>>> b017bc4ad5e631bb03624ee924a9af1266dad158
 This article answers common questions about the Azure Linux Container Host.
 
 ## General FAQs