diff --git a/engine/dispatcherprfl.go b/engine/dispatcherprfl.go
index 2b976b77c..d5bc33bdf 100644
--- a/engine/dispatcherprfl.go
+++ b/engine/dispatcherprfl.go
@@ -125,9 +125,7 @@ func (dps DispatcherProfiles) Sort() {
 	sort.Slice(dps, func(i, j int) bool { return dps[i].Weight > dps[j].Weight })
 }
 
-
 // DispatcherHost represents one virtual host used by dispatcher
->>>>>>> Dispatcher with support for dynamic hosts
 type DispatcherHost struct {
 	Tenant  string
 	ID      string