Updated toc.yml

Author: v-bhgad

articles/active-directory/saas-apps/toc.yml

@@ -1416,11 +1416,7 @@
         href: github-provisioning-tutorial.md
       - name: GoToMeeting
         href: citrixgotomeeting-provisioning-tutorial.md
-<<<<<<< HEAD
         name: Envoy
-=======
-        name: envoy
->>>>>>> 42cc73b625d31b849d90a0f516c3aaeaa903ac3b
         href: envoy-provisioning-tutorial.md
         name: Jive
         href: jive-provisioning-tutorial.md
@@ -1479,11 +1475,4 @@
       - name: Zscaler ZSCloud
         href: zscaler-zscloud-provisioning-tutorial.md
         name: Zoom
-        href: zoom-provisioning-tutorial.md
-<<<<<<< HEAD
-
-
-=======
-        name: 4me
-        href: 4me-provisioning-tutorial.md
->>>>>>> 42cc73b625d31b849d90a0f516c3aaeaa903ac3b
+        href: zoom-provisioning-tutorial.md