diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
index 5915aa0c..7cdf5cc5 100644
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@@ -27,8 +27,6 @@ services:
       MQ_PORT: "443"
       MQ_SERVER_PORT: "1883"
       VERBOSITY: "1"
-      MANAGE_IPTABLES: "on"
-      PORT_FORWARD_SERVICES: "dns"
       MQ_PASSWORD: "REPLACE_MQ_PASSWORD"
       MQ_USERNAME: "REPLACE_MQ_USERNAME"
       STUN_PORT: "3478"
diff --git a/controllers/hosts.go b/controllers/hosts.go
index f37488e1..0aefeb56 100644
--- a/controllers/hosts.go
+++ b/controllers/hosts.go
@@ -97,10 +97,6 @@ func updateHost(w http.ResponseWriter, r *http.Request) {
 	if updateRelay {
 		logic.UpdateHostRelay(currHost.ID.String(), currHost.RelayedHosts, newHost.RelayedHosts)
 	}
-<<<<<<< HEAD
-=======
-
->>>>>>> f4851937c1746475fdac99e9c562623128ba16b1
 	// publish host update through MQ
 	if err := mq.HostUpdate(&models.HostUpdate{
 		Action: models.UpdateHost,