diff --git a/src/main/java/com/microsoft/azure/AzureVMManagementServiceDelegate.java b/src/main/java/com/microsoft/azure/AzureVMManagementServiceDelegate.java
index 68681a1..9d8dc2d 100644
--- a/src/main/java/com/microsoft/azure/AzureVMManagementServiceDelegate.java
+++ b/src/main/java/com/microsoft/azure/AzureVMManagementServiceDelegate.java
@@ -342,19 +342,13 @@ public class AzureVMManagementServiceDelegate {
         final StorageManagementClient storageClient = ServiceDelegateHelper.getStorageManagementClient(config);
 
         rmClient.getResourceGroupsOperations().createOrUpdate(resourceGroupName, new ResourceGroup(location));
-<<<<<<< HEAD
 
-=======
-        
-        try
-        {
->>>>>>> 17b8539365c3ff9c006753579036ecd4440ea752
-        StorageAccountCreateParameters createParams = new StorageAccountCreateParameters();
-        createParams.setLocation(location);
-        createParams.setAccountType(AccountType.StandardLRS);
-        storageClient.getStorageAccountsOperations().create(resourceGroupName, targetStorageAccount, createParams);
-        }catch (Exception e)
-        {
+        try {
+            StorageAccountCreateParameters createParams = new StorageAccountCreateParameters();
+            createParams.setLocation(location);
+            createParams.setAccountType(AccountType.StandardLRS);
+            storageClient.getStorageAccountsOperations().create(resourceGroupName, targetStorageAccount, createParams);
+        } catch (Exception e) {
             LOGGER.log(Level.INFO, e.getMessage());
         }
         // Get the storage account name and key