diff --git a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidfirePrimaryDataStoreProvider.java b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidfirePrimaryDataStoreProvider.java
index b6c92a38666..d84ac8ead24 100644
--- a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidfirePrimaryDataStoreProvider.java
+++ b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidfirePrimaryDataStoreProvider.java
@@ -38,13 +38,10 @@ public class SolidfirePrimaryDataStoreProvider extends
         DefaultPrimaryDataStore pds = DefaultPrimaryDataStore.createDataStore(dsv);
         SolidfirePrimaryDataStoreDriver driver = new SolidfirePrimaryDataStoreDriver();
         pds.setDriver(driver);
-<<<<<<< HEAD
+
         
         DefaultPrimaryDataStoreLifeCycleImpl lifeCycle = new DefaultPrimaryDataStoreLifeCycleImpl(dataStoreDao);
-=======
 
-        DefaultPrimaryDataStoreLifeCycleImpl lifeCycle = new DefaultPrimaryDataStoreLifeCycleImpl(super.dataStoreDao, pds);
->>>>>>> Getting things to compile
         pds.setLifeCycle(lifeCycle);
         return pds;
     }