diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index 698cc9650..873f80fe0 100755
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -4494,14 +4494,12 @@ class HypemIE(InfoExtractor):
         data = {'ax':1 ,
                   'ts': time.time()
               }
-<<<<<<< HEAD
         id = mobj.group(1)
         data_encoded = compat_urllib_parse.urlencode(data)
         complete_url = url + "?"+data_encoded
         request = compat_urllib_request.Request(complete_url)
         response,urlh = self._download_webpage_handle(request, id, u'Downloading webpage with the url')
         cookie = urlh.headers.get('Set-Cookie', '')
-=======
         data_encoded = compat_urllib_parse.urlencode(data)
         complete_url = url + "?"+data_encoded
         request = compat_urllib_request.Request(complete_url)
@@ -4513,7 +4511,6 @@ class HypemIE(InfoExtractor):
         #grab the HTML
         html = response.read().decode(encoding)
         response.close()
->>>>>>> remotes/origin/HEAD
         track_list = []
         list_data = re.search(r'<script type="application/json" id="displayList-data">\n    (.*)    </script>',response)
         html_tracks = list_data.group(1)