resolve merge conflicts

Author: laujan

.openpublishing.redirection.json

@@ -1,5 +1,75 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/search/performance-benchmarks.md",
+      "redirect_url": "/previous-versions/azure/search/performance-benchmarks",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/search/search-traffic-analytics.md",
+      "redirect_url": "/previous-versions/azure/search/search-traffic-analytics",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/genomics/frequently-asked-questions-genomics.yml",
+      "redirect_url": "/previous-versions/azure/genomics/frequently-asked-questions-genomics",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/genomics/index.yml",
+      "redirect_url": "/previous-versions/azure/genomics/index",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/genomics/business-continuity-genomics.md",
+      "redirect_url": "/previous-versions/azure/genomics/business-continuity-genomics",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/genomics/file-support-ticket-genomics.md",
+      "redirect_url": "/previous-versions/azure/genomics/file-support-ticket-genomics",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/genomics/overview-what-is-genomics.md",
+      "redirect_url": "/previous-versions/azure/genomics/overview-what-is-genomics",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/genomics/quickstart-input-bam.md",
+      "redirect_url": "/previous-versions/azure/genomics/quickstart-input-bam",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/genomics/quickstart-input-multiple.md",
+      "redirect_url": "/previous-versions/azure/genomics/quickstart-input-multiple",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/genomics/quickstart-input-pair-fastq.md",
+      "redirect_url": "/previous-versions/azure/genomics/quickstart-input-pair-fastq",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/genomics/quickstart-input-sas.md",
+      "redirect_url": "/previous-versions/azure/genomics/quickstart-input-sas",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/genomics/quickstart-run-genomics-workflow-portal.md",
+      "redirect_url": "/previous-versions/azure/genomics/quickstart-run-genomics-workflow-portal",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/genomics/troubleshooting-guide-genomics.md",
+      "redirect_url": "/previous-versions/azure/genomics/troubleshooting-guide-genomics",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/genomics/version-release-history-genomics.md",
+      "redirect_url": "/previous-versions/azure/genomics/version-release-history-genomics",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/ai-studio/concepts/what-are-ai-services.md",
       "redirect_url": "/azure/ai-services/what-are-ai-services",
@@ -169,6 +239,26 @@
       "source_path_from_root": "/articles/ai-services/openai/references/azure-machine-learning.md",
       "redirect_url": "/azure/ai-services/openai/concepts/use-your-data",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/open-datasets/dataset-covid-19-open-research.md",
+      "redirect_url": "/azure/open-datasets/dataset-catalog",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/language-service/language-studio.md",
+      "redirect_url": "/azure/ai-services/language-service/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/language-service/summarization/region-support.md",
+      "redirect_url": "/azure/ai-services/language-service/concepts/regional-support",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/open-datasets/dataset-genomics-data-lake.md",
+      "redirect_url": "/azure/open-datasets/dataset-catalog",
+      "redirect_document_id": false
     }
   ]
-}
+}

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "cSpell.words": [
+        "DALL"
+    ]
+}