Fix merge conflict

Author: pauljewellmsft

.openpublishing.redirection.json

@@ -1,5 +1,10 @@
 {
     "redirections": [
+    {
+      "source_path": "articles/storage/tables/table-storage-design-encrypt-data.md",
+      "redirect_url": "/previous-versions/azure/storage/tables/table-storage-design-encrypt-data",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/databox-online/azure-stack-edge-zero-touch-provisioning.md",
       "redirect_url": "/azure/databox-online/azure-stack-edge-powershell-based-configuration",

articles/storage/tables/TOC.yml

@@ -1,13 +1,13 @@
 - name: Azure Table storage documentation
   href: ./index.yml
 - name: Overview
-  expanded: true
-  items: 
+  items:
   - name: Azure Table storage overview
     href: table-storage-overview.md
   - name: Choose Table storage or Azure Cosmos DB for Table
     href: ../../cosmos-db/table-support.md
-    maintainContext: true   
+    maintainContext: true
+  expanded: true
 - name: Quickstarts
   items:
   - name: Create a table in the Azure portal
@@ -16,27 +16,27 @@
   items:
   - name: .NET
     href: ../../cosmos-db/tutorial-develop-table-dotnet.md
-    maintainContext: true  
+    maintainContext: true
   - name: F#
     href: /dotnet/articles/fsharp/using-fsharp-on-azure/table-storage
     maintainContext: true
   - name: Java
     href: ../../cosmos-db/table-storage-how-to-use-java.md
-    maintainContext: true  
+    maintainContext: true
   - name: Node.js
     href: ../../cosmos-db/table-storage-how-to-use-nodejs.md
     maintainContext: true
-  - name: C++ 
+  - name: C++
     href: ../../cosmos-db/table-storage-how-to-use-c-plus.md
     maintainContext: true
   - name: PHP
     href: ../../cosmos-db/table-storage-how-to-use-php.md
-    maintainContext: true 
+    maintainContext: true
   - name: Python
     href: ../../cosmos-db/table-storage-how-to-use-python.md
-    maintainContext: true 
+    maintainContext: true
   - name: Go
-    href: ../../cosmos-db/table-storage-how-to-use-go.md 
+    href: ../../cosmos-db/table-storage-how-to-use-go.md
     maintainContext: true
   - name: Ruby
     href: ../../cosmos-db/table-storage-how-to-use-ruby.md
@@ -83,16 +83,14 @@
     items:
     - name: Performance and scalability checklist
       href: storage-performance-checklist.md
-    - name: Design scalable and performant tables 
+    - name: Design scalable and performant tables
       href: table-storage-design.md
   - name: Guidelines for table design
     href: table-storage-design-guidelines.md
   - name: Design for querying
     href: table-storage-design-for-query.md
   - name: Design for data modification
     href: table-storage-design-for-modification.md
-  - name: Encrypting table data
-    href: table-storage-design-encrypt-data.md
   - name: Modeling relationships
     href: table-storage-design-modeling.md
   - name: Table design patterns
@@ -103,8 +101,8 @@
   items:
   - name: Create a storage account
     displayName: resource manager, resource manager template, template, ARM
-    href: ../common/storage-account-create.md?toc=/azure/storage/tables/toc.json  
-    maintainContext: true 
+    href: ../common/storage-account-create.md?toc=/azure/storage/tables/toc.json
+    maintainContext: true
   - name: Upgrade a storage account
     href: ../common/storage-account-upgrade.md?toc=/azure/storage/tables/toc.json
   - name: Recover a deleted storage account
@@ -142,10 +140,10 @@
             href: ../common/customer-managed-keys-configure-existing-account.md?toc=/azure/storage/tables/toc.json
         - name: Configure customer-managed keys in a different tenant
           items:
-            - name: Configure customer-managed keys for a new account
-              href: ../common/customer-managed-keys-configure-cross-tenant-new-account.md?toc=/azure/storage/tables/toc.json
-            - name: Configure customer-managed keys for an existing account
-              href: ../common/customer-managed-keys-configure-cross-tenant-existing-account.md?toc=/azure/storage/tables/toc.json
+          - name: Configure customer-managed keys for a new account
+            href: ../common/customer-managed-keys-configure-cross-tenant-new-account.md?toc=/azure/storage/tables/toc.json
+          - name: Configure customer-managed keys for an existing account
+            href: ../common/customer-managed-keys-configure-cross-tenant-existing-account.md?toc=/azure/storage/tables/toc.json
         - name: Configure customer-managed keys in a managed HSM
           href: ../common/customer-managed-keys-configure-key-vault-hsm.md?toc=/azure/storage/tables/toc.json
       - name: Enable infrastructure encryption for the account
@@ -159,15 +157,15 @@
       - name: Python
         href: ../common/storage-client-side-encryption-python.md?toc=/azure/storage/tables/toc.json
     - name: Configure network security
-      items: 
+      items:
       - name: Configure firewalls and virtual networks
         href: ../common/storage-network-security.md?toc=/azure/storage/tables/toc.json
       - name: Require secure transfer
         href: ../common/storage-require-secure-transfer.md?toc=/azure/storage/tables/toc.json
       - name: Manage Transport Layer Security (TLS)
         items:
         - name: Enforce minimum TLS version for incoming requests
-          href: ../common/transport-layer-security-configure-minimum-version.md?toc=/azure/storage/tables/toc.json 
+          href: ../common/transport-layer-security-configure-minimum-version.md?toc=/azure/storage/tables/toc.json
         - name: Configure TLS version for a client application
           href: ../common/transport-layer-security-configure-client-version.md?toc=/azure/storage/tables/toc.json
     - name: Enable threat protection with Microsoft Defender for Storage
@@ -178,18 +176,18 @@
       href: ../common/redundancy-migration.md?toc=/azure/storage/tables/toc.json
     - name: Design highly available applications
       items:
-        - name: .NET (v12 SDK)
-          href: ../common/geo-redundant-design.md?toc=/azure/storage/tables/toc.json
-        - name: .NET (v11 SDK)
-          href: ../common/geo-redundant-design-legacy.md?toc=/azure/storage/tables/toc.json
+      - name: .NET (v12 SDK)
+        href: ../common/geo-redundant-design.md?toc=/azure/storage/tables/toc.json
+      - name: .NET (v11 SDK)
+        href: ../common/geo-redundant-design-legacy.md?toc=/azure/storage/tables/toc.json
   - name: Manage disaster recovery
     items:
     - name: Check the Last Sync Time property
       href: ../common/last-sync-time-get.md?toc=/azure/storage/tables/toc.json
     - name: Initiate account failover
       href: ../common/storage-initiate-account-failover.md?toc=/azure/storage/tables/toc.json
   - name: Transfer data
-    items:  
+    items:
     - name: AzCopy on Windows (v8)
       href: /previous-versions/azure/storage/storage-use-azcopy
     - name: AzCopy on Linux (v8)