resolve whats new conflict

Author: b-ahibbard

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

@@ -21,21 +21,18 @@ Azure NetApp Files is updated regularly. This article provides a summary about t
 
 ## February 2023
 
-<<<<<<< HEAD
 * [Customer-managed keys](configure-customer-managed-keys.md) (Preview)
 
     Azure NetApp Files volumes now support encryption with customer-managed keys and Azure Key Vault to enable an extra layer of security for data at rest.  
 
     Data encryption with customer-managed keys for Azure NetApp Files allows you to bring your own key for data encryption at rest. You can use this feature to implement separation of duties for managing keys and data. Additionally, you can centrally manage and organize keys using Azure Key Vault. With customer-managed encryption, you are in full control of, and responsible for, a key's lifecycle, key usage permissions, and auditing operations on keys. 
 
-=======
 * [Capacity pool enhancement](azure-netapp-files-set-up-capacity-pool.md) (Preview)
 
     Azure NetApp Files now supports a lower limit of 2 TiB for capacity pool sizing with Standard network features.
 
     You can now choose a minimum size of 2 TiB when creating a capacity pool. Capacity pools smaller than 4 TiB in size can only be used with volumes using standard network features. This enhancement provides a more cost effective solution for running workloads such as SAP-shared files and VDI that require lower capacity pool sizes for their capacity and performance needs. When you have less than 2-4 TiB capacity with proportional performance, this enhancement allows you to start with 2 TiB as a minimum pool size and increase with 1-TiB increments. For capacities less than 3 TiB, this enhancement saves cost by allowing you to re-evaluate volume planning to take advantage of savings of smaller capacity pools. This feature is supported in all [regions with Standard network features](azure-netapp-files-network-topologies.md#supported-regions).
 
->>>>>>> 71af041da8b71a7be323aff43ef1b9deed0d7ab0
 ## December 2022
 
 * [Azure Application Consistent Snapshot tool (AzAcSnap) 7](azacsnap-introduction.md)