diff --git a/pysolovideo.py b/pysolovideo.py
index d526a17..6448547 100644
--- a/pysolovideo.py
+++ b/pysolovideo.py
@@ -191,23 +191,15 @@ def startNetworkStream(self, port=8000):
         self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         self.socket.bind(('', port))
-<<<<<<< HEAD
         print ("Live stream socket listening on port {p}...".format(p=port))
-=======
-        print "Live stream socket listening on port {p}...".format(p=port)
->>>>>>> 2c18142d99048230a47ad507b4237c753bbd75ed
         self.pipe = None
         
         self.socket.listen(5)
 
         self.socket_thread_1 = threading.Thread(target=self.socket_listen)
-<<<<<<< HEAD
         self.socket_thread_1.daemon=True
         self.socket_thread_2 = threading.Thread(target=self.socket_stream)
         self.socket_thread_2.daemon=True
-=======
-        self.socket_thread_2 = threading.Thread(target=self.socket_stream)
->>>>>>> 2c18142d99048230a47ad507b4237c753bbd75ed
         self.keepSocket = True
         
         self.socket_thread_1.start()