Added updates

Author: stevenmatthew

articles/storage-mover/includes/protocol-endpoint-agent.md

@@ -2,7 +2,7 @@
 author: stevenmatthew
 ms.author: shaas
 ms.topic: include
-ms.date: 06/27/2025
+ms.date: 07/01/2025
 ms.service: azure-storage-mover
 ---
 <!-- 
@@ -17,17 +17,10 @@ Handle file and content with care.
 
 The current Azure Storage Mover release supports full-fidelity migrations for specific source-target pair combinations. Always utilize the latest agent version to benefit from these supported sources and destinations:
 
-<<<<<<< HEAD
-|Source protocol        |Target                                                | Comments                                                                  |
-|-----------------------|------------------------------------------------------|---------------------------------------------------------------------------|
-| S3 (Preview)          | Azure blob storage container                         | AWS S3 buckets with the S3 Object Lock feature enabled are not supported. |
-| SMB 2.x & 3.x mount   | Azure blob storage container, Azure file share (SMB) | SMB 1.x sources and NFS Azure file shares are currently not supported.    |
+|Source protocol        |Target                                                | Comments                                                                                |
+|-----------------------|------------------------------------------------------|-----------------------------------------------------------------------------------------|
+| S3 (Preview)          | Azure blob storage container                         | AWS S3 buckets with Glacier or Glacier Deep Archive storage classes cannot be migrated. |
+| SMB 2.x & 3.x mount   | Azure blob storage container, Azure file share (SMB) | SMB 1.x sources and NFS Azure file shares are currently not supported.                  |
 | SMB 2.x and 3.x mount | Azure blob storage container                         | Containers with the Hierarchical Namespace Service (HNS) feature enabled are supported and the ADLS Gen2 REST API set is used for migration. |
 | NFS 3 & 4 mount       | Azure blob storage container                         | Containers with the Hierarchical Namespace Service (HNS) feature enabled are supported and the ADLS Gen2 REST API set is used for migration. |
-=======
-|Source protocol   |Target                                                        |Comments                                                               |
-|------------------|--------------------------------------------------------------|-----------------------------------------------------------------------|
-|SMB 2.x & 3.x mount     |Azure blob storage container, Azure file share (SMB)          | SMB 1.x sources and NFS Azure file shares are currently not supported. |
-|SMB 2.x and 3.x mount     |Azure blob storage container                                  | Containers with the Hierarchical Namespace Service (HNS) feature enabled are supported and the ADLS Gen2 REST API set is used for migration.|
-|NFS 3 & 4 mount   |Azure blob storage container                                  | Containers with the Hierarchical Namespace Service (HNS) feature enabled are supported and the ADLS Gen2 REST API set is used for migration.|
->>>>>>> 1a955314871ee35f965e6c61931e5b904031382d
+