fix merge conflict

Author: khdownie

articles/storage/files/TOC.yml

@@ -77,8 +77,6 @@
       href: ../common/storage-use-azcopy-files.md?toc=/azure/storage/files/toc.json
     - name: Configure, optimize, and troubleshoot AzCopy
       href: ../common/storage-use-azcopy-configure.md?toc=/azure/storage/files/toc.json
-  - name: Migrate GlusterFS to Azure Files
-    href: glusterfs-migration-guide.md      
 - name: Authentication and authorization
   items:
   - name: Overview of identity-based authentication
@@ -157,6 +155,8 @@
       href: ../common/storage-service-encryption.md?toc=/azure/storage/files/toc.json
     - name: Encryption at rest with customer-managed keys
       href: ../common/customer-managed-keys-overview.md?toc=/azure/storage/files/toc.json
+    - name: Encryption in transit for NFS shares
+      href: encryption-in-transit-for-nfs-shares.md
     - name: Manage encryption keys for the storage account
       items:
       - name: Check the encryption key model for the account

articles/storage/files/glusterfs-migration-guide.md

@@ -4,7 +4,7 @@ description: Red Hat Gluster Storage (based on GlusterFS) has reached the end of
 author: khdownie
 ms.service: azure-file-storage
 ms.topic: how-to
-ms.date: 05/05/2025
+ms.date: 05/19/2025
 ms.author: kendownie
 ---