diff --git a/cmd/cgr-engine/rater.go b/cmd/cgr-engine/rater.go
index cf0b5b21b..a2a9720a5 100755
--- a/cmd/cgr-engine/rater.go
+++ b/cmd/cgr-engine/rater.go
@@ -104,7 +104,7 @@ func startRater(internalRaterChan chan rpcclient.RpcClientConnection, cacheDoneC
 		if cCfg, has := cacheCfg[utils.CacheFilters]; !has || !cCfg.Precache {
 			fltrIDs = make([]string, 0)
 		}
-		if cCfg, has := cfg.CacheConfig[utils.CacheLCRProfiles]; !has || !cCfg.Precache {
+		if cCfg, has := cacheCfg[utils.CacheLCRProfiles]; !has || !cCfg.Precache {
 			lcrPrfIDs = make([]string, 0)
 		}
 
diff --git a/cmd/cgr-migrator/cgr-migrator.go b/cmd/cgr-migrator/cgr-migrator.go
index 6b99f6a9b..465db9b37 100755
--- a/cmd/cgr-migrator/cgr-migrator.go
+++ b/cmd/cgr-migrator/cgr-migrator.go
@@ -121,8 +121,10 @@ func main() {
 			}
 		}
 		if *inStorDBType != "" {
-			instorDB, err = engine.ConfigureStorStorage(*inStorDBType, *inStorDBHost, *inStorDBPort, *inStorDBName, *inStorDBUser, *inStorDBPass, *inDBDataEncoding,
-				config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns, config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes)
+			instorDB, err = engine.ConfigureStorStorage(*inStorDBType, *inStorDBHost, *inStorDBPort,
+				*inStorDBName, *inStorDBUser, *inStorDBPass, *inDBDataEncoding,
+				config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns,
+				config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes)
 			if err != nil {
 				log.Fatal(err)
 			}
diff --git a/engine/version.go b/engine/version.go
index 4f682d71a..b0959e32c 100644
--- a/engine/version.go
+++ b/engine/version.go
@@ -107,7 +107,6 @@ func (vers Versions) Compare(curent Versions, storType string) string {
 	return ""
 }
 
-<<<<<<< HEAD
 func CurrentDataDBVersions() Versions {
 	return Versions{
 		utils.StatS:               2,
diff --git a/general_tests/ddazmbl1_test.go b/general_tests/ddazmbl1_test.go
index 2ea863922..f627e369a 100644
--- a/general_tests/ddazmbl1_test.go
+++ b/general_tests/ddazmbl1_test.go
@@ -119,7 +119,6 @@ TOPUP10_AT,TOPUP10_AC1,ASAP,10`
 	cache.Flush()
 	/*
 		dataDB.LoadDataDBCache(nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil)
-
 		if cachedDests := cache.CountEntries(utils.DESTINATION_PREFIX); cachedDests != 0 {
 			t.Error("Wrong number of cached destinations found", cachedDests)
 		}