updating

Author: billmath

articles/security/fundamentals/TOC.yml

@@ -52,14 +52,10 @@
     href: identity-management-best-practices.md
   - name: Security checklist
     href: steps-secure-identity.md
-<<<<<<< HEAD
   - name: Choose passwordless 
     href: ad-passwordless.md
 
-=======
-  - name: Choose Azure AD authentication
-    href: choose-ad-authn.md
->>>>>>> 4a5a495aef853270fc84e0965fe8388dcada7a0d
+
 
 - name: Network security
   items: