fixing merge conflicts

Author: itechedit

.github/workflows/stale.yml

@@ -19,8 +19,7 @@ jobs:
         close-pr-label: auto-close
         exempt-pr-labels: keep-open
         operations-per-run: 1200
-        ascending: true
-        start-date: '2021-04-15'
+        ascending: false
         stale-pr-message: >
           This pull request has been inactive for at least 14 days.
           If you are finished with your changes, don't forget to sign off. See the [contributor guide](https://review.docs.microsoft.com/help/contribute/contribute-how-to-write-pull-request-automation) for instructions.

.openpublishing.publish.config.json

@@ -591,12 +591,6 @@
       "branch": "master",
       "branch_mapping": {}
     },
-    {
-      "path_to_root": "samples-cosmosdb-dotnet-v2",
-      "url": "https://github.com/Azure/azure-cosmos-dotnet-v2",
-      "branch": "master",
-      "branch_mapping": {}
-    },
     {
       "path_to_root": "samples-cosmosdb-java-v4-web-app",
       "url": "https://github.com/Azure-Samples/azure-cosmos-java-sql-api-todo-app",
@@ -717,12 +711,6 @@
       "branch": "master",
       "branch_mapping": {}
     },
-    {
-      "path_to_root": "azure-cosmosdb-java-v2",
-      "url": "https://github.com/Azure/azure-cosmosdb-java",
-      "branch": "master",
-      "branch_mapping": {}
-    },
     {
       "path_to_root": "azure-cosmosdb-graph-dotnet",
       "url": "https://github.com/Azure-Samples/azure-cosmos-db-graph-gremlindotnet-getting-started",

.openpublishing.redirection.active-directory.json

@@ -10,6 +10,11 @@
           "redirect_url": "/azure/active-directory/manage-apps/what-is-application-management",
           "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/active-directory/authentication/how-to-nudge-authenticator-app.md",
+            "redirect_url": "/azure/active-directory/authentication/how-to-mfa-registration-campaign",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/active-directory/develop/active-directory-v2-limitations.md",
             "redirect_url": "/azure/active-directory/azuread-dev/azure-ad-endpoint-comparison",
@@ -1670,6 +1675,26 @@
             "redirect_url": "/azure/active-directory/authentication/tutorial-enable-azure-mfa",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/active-directory/conditional-access/require-managed-devices.md",
+            "redirect_url": "/azure/active-directory/conditional-access/concept-conditional-access-grant",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/active-directory/conditional-access/untrusted-networks.md",
+            "redirect_url": "/azure/active-directory/conditional-access/howto-conditional-access-policy-all-users-mfa",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/active-directory/conditional-access/app-based-conditional-access.md",
+            "redirect_url": "/azure/active-directory/conditional-access/howto-policy-approved-app-or-app-protection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/active-directory/conditional-access/app-protection-based-conditional-access.md",
+            "redirect_url": "/azure/active-directory/conditional-access/howto-policy-approved-app-or-app-protection",
+            "redirect_document_id": true
+        },
         {
             "source_path_from_root": "/articles/active-directory/authentication/quickstart-sspr.md",
             "redirect_url": "/azure/active-directory/authentication/tutorial-enable-sspr",
@@ -9888,7 +9913,7 @@
         {
             "source_path_from_root": "/articles/active-directory/active-directory-saas-workplacebyfacebook-provisioning-tutorial.md",
             "redirect_url": "/azure/active-directory/saas-apps/workplace-by-facebook-provisioning-tutorial",
-            "redirect_document_id": true
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/active-directory/active-directory-saas-workplacebyfacebook-tutorial.md",

.openpublishing.redirection.azure-web-pubsub.json

@@ -4,16 +4,6 @@
             "source_path_from_root": "/articles/azure-web-pubsub/howto-troubleshoot-diagnostic-logs.md",
             "redirect_url": "/azure/azure-web-pubsub/howto-troubleshoot-resource-logs",
             "redirect_document_id": false
-        },
-        {
-          "source_path_from_root": "/articles/azure-web-pubsub/reference-server-sdk-csharp.md",
-          "redirect_url": "/dotnet/api/overview/azure/webpubsub/client",
-          "redirect_document_id": false
-        },
-        {
-          "source_path_from_root": "/articles/azure-web-pubsub/reference-server-sdk-java.md",
-          "redirect_url": "/java/api/overview/azure/webpubsub/client",
-          "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.data-factory.json

@@ -14,6 +14,11 @@
             "source_path_from_root": "/articles/data-factory/continuous-integration-deployment.md",
             "redirect_url": "/azure/data-factory/continuous-integration-delivery",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/data-factory/continuous-integration-deployment-improvements.md",
+            "redirect_url": "/azure/data-factory/continuous-integration-delivery-improvements",
+            "redirect_document_id": false
         }
     ]
 }