diff --git a/channels/cinemalibero.py b/channels/cinemalibero.py
index 02553f29..06f4abe7 100644
--- a/channels/cinemalibero.py
+++ b/channels/cinemalibero.py
@@ -13,7 +13,6 @@ from platformcode import logger
 from specials import autoplay
 import channelselector
 
-__channel__ = 'cinemalibero'
 # Necessario per Autoplay
 IDIOMAS = {'Italiano': 'IT'}
 list_language = IDIOMAS.values()
@@ -24,6 +23,7 @@ list_quality = ['default']
 checklinks = config.get_setting('checklinks', 'cinemalibero')
 checklinks_number = config.get_setting('checklinks_number', 'cinemalibero')
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 #host = 'https://www.cinemalibero.fun/'
 =======
@@ -32,6 +32,11 @@ host = config.get_channel_url(__channel__)
 >>>>>>> kodiondemand-master
 
 host = config.get_setting("channel_host", __channel__)
+=======
+__channel__ = "cinemalibero"
+host = config.get_channel_url(__channel__)
+
+>>>>>>> e5c926a6784a44ffd5486b4d34bb7ae92408622e
 headers = [['Referer', host]]
 
 def mainlist(item):
diff --git a/channels/eurostreaming.py b/channels/eurostreaming.py
index 90b7043f..6dae5e26 100644
--- a/channels/eurostreaming.py
+++ b/channels/eurostreaming.py
@@ -25,12 +25,16 @@ from platformcode import logger, config
 
 __channel__ = "eurostreaming"
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 #host = "https://eurostreaming.cafe/"
 host = config.get_setting("channel_host", __channel__)
 =======
 host = config.get_channel_url(__channel__)
 >>>>>>> kodiondemand-master
+=======
+host = config.get_channel_url(__channel__)
+>>>>>>> e5c926a6784a44ffd5486b4d34bb7ae92408622e
 headers = ['Referer', host]
 
 list_servers = ['verystream', 'wstream', 'speedvideo', 'flashx', 'nowvideo', 'streamango', 'deltabit', 'openload']
diff --git a/servers/speedvideo.json b/servers/speedvideo.json
index dc8460d5..daf20acc 100644
--- a/servers/speedvideo.json
+++ b/servers/speedvideo.json
@@ -5,17 +5,23 @@
     "patterns": [
       {
         "pattern": "speedvideo.net/(?:embed-|)([A-Z0-9a-z]+)",
+<<<<<<< HEAD
 <<<<<<< HEAD
         "url": "https:\/\/speedvideo.net\/embed-\\1.html"
       }  
 =======
+=======
+>>>>>>> e5c926a6784a44ffd5486b4d34bb7ae92408622e
         "url": "http://speedvideo.net/embed-\\1.html"
       },
       {
         "pattern": "speedvideo.net/(?:embed-|)([A-Z0-9a-z]+)",
         "url": "https://speedvideo.net/embed-\\1.html"
       }
+<<<<<<< HEAD
 >>>>>>> kodiondemand-master
+=======
+>>>>>>> e5c926a6784a44ffd5486b4d34bb7ae92408622e
     ]
   },
   "free": true,