diff --git a/dq.go b/dq.go
index cab42a84aaa..06e7d0bd5c1 100644
--- a/dq.go
+++ b/dq.go
@@ -27,11 +27,8 @@ func getDQTopic() string {
 	if config.DBAppConfOptions.NodeIsSegmented {
 		if len(config.DBAppConfOptions.Tags) > 0 {
 			tags := strings.Join(config.DBAppConfOptions.Tags, ".")
-<<<<<<< HEAD
 			topic += "." + tags
-=======
-			topic = topic + "." + tags
->>>>>>> 0aa83273284dc7754eb1e00913df4b54c2a17439
+
 		}
 	}
 
diff --git a/gateway_test.go b/gateway_test.go
index b9b468d7ba3..e63356076f3 100644
--- a/gateway_test.go
+++ b/gateway_test.go
@@ -768,7 +768,6 @@ func TestDistributedQuotaSingleNode(t *testing.T) {
 	config.DQSetMaster = true
 	config.UseDistributedQuotaCounter = true
 	config.DistributedQuotaFlushIntervalInMS = 100
-
 	defer func(){
 		config.DQSetMaster = false
 		config.UseDistributedQuotaCounter = false