diff --git a/main.go b/main.go
index 4c715b6efa3..0938c555b1f 100644
--- a/main.go
+++ b/main.go
@@ -779,34 +779,23 @@ func initialiseSystem(arguments map[string]interface{}) error {
 		afterConfSetup(&config.Global)
 	}
 
-<<<<<<< HEAD
 	if os.Getenv("TYK_LOGLEVEL") == "" && arguments["--debug"] == false {
 		switch strings.ToLower(config.Global.LogLevel) {
 		case "", "info":
 			//defualt, do nothing
-=======
-	if os.Getenv("TYK_LOGLEVEL") == "" && arguments["--debug"] == false && config.Global.LogLevel != "" {
-		switch strings.ToLower(config.Global.LogLevel) {
->>>>>>> 9eec51288b412d3ee36a967c867901e33fb9bc01
 		case "error":
 			log.Level = logrus.ErrorLevel
 		case "warn":
 			log.Level = logrus.WarnLevel
 		case "debug":
 			log.Level = logrus.DebugLevel
-<<<<<<< HEAD
+
 		default:
 			log.WithFields(logrus.Fields{
 				"prefix": "main",
 			}).Fatal("Invalid log level in config, must be error, warn or debug.")
 		}
 
-=======
-		}
-		log.WithFields(logrus.Fields{
-			"prefix": "main",
-		}).Debugf("Using log level defined in config. Enabling %s-level output", strings.ToLower(config.Global.LogLevel))
->>>>>>> 9eec51288b412d3ee36a967c867901e33fb9bc01
 	}
 
 	if config.Global.Storage.Type != "redis" {