fix image paths

Author: b-ahibbard

articles/azure-netapp-files/configure-customer-managed-keys-hardware.md

@@ -153,7 +153,7 @@ To use a system-assigned identity, the Azure Key Vault must be configured to use
     * Select the NetApp **Subscription**.
     * For **Identity type**, select **System-assigned**.
 
-    :::image type="content" source="./media/azure-netapp-files/key-enter-uri.png" alt-text="Screenshot of the encryption menu showing key URI field." lightbox="./media/azure-netapp-files/key-enter-uri.png":::
+    :::image type="content" source="./media/configure-customer-managed-keys/key-enter-uri.png" alt-text="Screenshot of the encryption menu showing key URI field." lightbox="./media/configure-customer-managed-keys//key-enter-uri.png":::
 
 1. Select **Save**.
 
@@ -173,7 +173,7 @@ To use a system-assigned identity, the Azure Key Vault must be configured to use
         * "Microsoft.KeyVault/vaults/keys/decrypt/action"
     The user-assigned identity you select is added to your NetApp account. Due to RBAC being customizable, the Azure portal doesn't configure access to the key vault. For more information, see [Using Azure RBAC secret, key, and certificate permissions with Key Vault](../key-vault/general/rbac-guide.md#using-azure-rbac-secret-key-and-certificate-permissions-with-key-vault)
 
-    :::image type="content" source="./media/azure-netapp-files/encryption-user-assigned.png" alt-text="Screenshot of user-assigned submenu." lightbox="./media/azure-netapp-files/encryption-user-assigned.png":::
+    :::image type="content" source="./media/configure-customer-managed-keys/encryption-user-assigned.png" alt-text="Screenshot of user-assigned submenu." lightbox="./media/configure-customer-managed-keys/encryption-user-assigned.png":::
 
 1. Select **Save**.
 

articles/azure-netapp-files/whats-new.md

@@ -14,12 +14,10 @@ ms.author: anfdocs
 
 Azure NetApp Files is updated regularly. This article provides a summary about the latest new features and enhancements.
 
-<<<<<<< HEAD
-* [Volume encryption with customer-managed keys with managed ardware Security Module (HSM)](configure-customer-managed-keys-hardware.md) (Preview)
+* [Volume encryption with customer-managed keys with managed Hardware Security Module (HSM)](configure-customer-managed-keys-hardware.md) (Preview)
 
     Volume encryption with customer-managed keys with managed HSM extends the [customer-managed keys](configure-customer-managed-keys.md), enabling you to store your keys in a more secure FIPS 140-2 Level 3 HSM service instead of the FIPS 140-2 Level 1 or 2 encryption offered with Azure Key Vault. 
 
-=======
 ## April 2024 
 
 * [Application volume group for Oracle](application-volume-group-oracle-introduction.md) (Preview)
@@ -32,7 +30,6 @@ Azure NetApp Files is updated regularly. This article provides a summary about t
 
     Application volume group for Oracle is supported in all Azure NetApp Files-enabled regions.
 
->>>>>>> a25a70ebd7353d631242f79fd206eb8344fc9187
 ## March 2024
 
 * [Large volumes (Preview) improvement:](large-volumes-requirements-considerations.md) new minimum size of 50 TiB