diff --git a/salt/utils/network.py b/salt/utils/network.py
index 6cb0ca3fd4..1fde1f4513 100644
--- a/salt/utils/network.py
+++ b/salt/utils/network.py
@@ -236,8 +236,13 @@ def get_fqhostname():
     """
     Returns the fully qualified hostname
     """
+<<<<<<< HEAD
     fqdn = []
     fqdn.append(socket.getfqdn())
+=======
+    l = []
+    l.append(socket.getfqdn())
+>>>>>>> fix parse_host_port() parse error on hostname only arg
 
     # try socket.getaddrinfo
     try: