Resolved merge conflict by keeping the latest changes.

Author: Nelson Daniel Troncoso

src/ResourceManager/Storage/Commands.Management.Storage.Test/ScenarioTests/StorageDataPlaneTests.ps1

@@ -487,4 +487,4 @@ function New-TestResourceGroupAndStorageAccount
     $storageAccountType = 'Standard_LRS'# Standard Geo-Reduntand Storage
     New-AzureRmResourceGroup -Name $ResourceGroupName -Location $location
     New-AzureRmStorageAccount -Name $storageAccountName -ResourceGroupName $ResourceGroupName -Location $location -Type $storageAccountType
-}
+}