diff --git a/windows/client-management/mdm/policy-csp-experience.md b/windows/client-management/mdm/policy-csp-experience.md index 47b5293f9e..55a43ec5ac 100644 --- a/windows/client-management/mdm/policy-csp-experience.md +++ b/windows/client-management/mdm/policy-csp-experience.md @@ -1545,7 +1545,10 @@ Microsoft Edge on your PC: +<<<<<<< HEAD +======= +>>>>>>> 3c06afe9875ad82fff960313bea663f49a2f7d2c
Footnote: