Resolved merge conflict

Author: LouisBerner

articles/databox-online/azure-stack-edge-operational-guidelines-faq.yml

@@ -62,14 +62,9 @@ sections:
           - If the device is faulty, damaged, or lost, and loss isn't the customer's fault, Microsoft may:
             - Send a field support person to address the issue, or 
             - Replace the device. For more information, see the frequently asked questions section on the [Azure Stack Edge pricing page](https://azure.microsoft.com/pricing/details/azure-stack/edge/).
-<<<<<<< HEAD
           - If you have a software issue with your Kubernetes service that you can't fix yourself, or if you have a virtual machine management question that isn't already documented, the Microsoft support team may consult with you to triage the issue and debug it remotely.
           - To address software issues in the Azure Stack Edge platform or services that run on it, Microsoft may work with you directly to provide a workaround or a fix available via a software update.
           - For information about software updates for your device, see [Update your Azure Stack Edge Pro GPU](https://docs.microsoft.com/azure/databox-online/azure-stack-edge-gpu-install-update?tabs=version-2106-and-later).
-=======
-          - If you have a software issue with your Kubernetes service that you can't fix yourself, or if you have a virtual machine management question that is not already documented, the Microsoft support team will consult with you to triage the issue and debug it remotely.
-          - To address software issues in the Azure Stack Edge platform or services that run on it, Microsoft may work with you directly to provide a fix or workaround, or they might provide a fix available via a software update. For more information about software updates for your device, see [Update your Azure Stack Edge Pro GPU](./azure-stack-edge-gpu-install-update.md?tabs=version-2106-and-later).
->>>>>>> 0a694b0852d77e7730f70a1361ac4ed78912916a
 
 additionalContent: |