fix merge conflicts

Author: omondiatieno

.openpublishing.redirection.active-directory.json

@@ -5486,11 +5486,6 @@
       "redirect_url": "/azure/active-directory/develop/application-consent-experience",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/active-directory/develop/v2-permissions-and-consent.md",
-      "redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/active-directory/manage-apps/consent-and-permissions-overview.md",
       "redirect_url": "/azure/active-directory/manage-apps/user-admin-consent-overview",

articles/active-directory/develop/TOC.yml

@@ -54,6 +54,8 @@
         - name: Conditional Access auth context
           href: developer-guide-conditional-access-authentication-context.md
           displayName: ca
+        - name: Permissions and consent framework
+          href: v2-permissions-and-consent.md
     - name: App registrations and workload identities
       displayName: App configuration
       items: