Fix merge conflicts

Author: yifanz7

src/Storage/Storage.Management/Models/PSStorageAccount.cs

@@ -168,7 +168,6 @@ public PSStorageAccount(StorageModels.StorageAccount storageAccount)
         public PSImmutableStorageAccount ImmutableStorageWithVersioning { get; set; }
         public PSStorageAccountSkuConversionStatus StorageAccountSkuConversionStatus { get; set; }
 
-        public string AllowedCopyScope { get; set; }
         public string DnsEndpointType { get; set; }
 
         public static PSStorageAccount Create(StorageModels.StorageAccount storageAccount, IStorageManagementClient client)