diff --git a/client/firewall/iptables/manager_linux.go b/client/firewall/iptables/manager_linux.go
index ba1d4340d..e5aafd6d8 100644
--- a/client/firewall/iptables/manager_linux.go
+++ b/client/firewall/iptables/manager_linux.go
@@ -19,7 +19,6 @@ const (
 
 // Manager of iptables firewall
 type Manager struct {
-<<<<<<< HEAD
 	mutex sync.Mutex
 
 	ipv4Client *iptables.IPTables