diff --git a/youtube_dl/extractor/youku.py b/youtube_dl/extractor/youku.py
index 24e3953bd..30cd80611 100644
--- a/youtube_dl/extractor/youku.py
+++ b/youtube_dl/extractor/youku.py
@@ -87,10 +87,6 @@ class YoukuIE(InfoExtractor):
         # get oip
         oip = data['security']['ip']
 
-<<<<<<< HEAD
-=======
-        # get fileid
->>>>>>> githubMaster/youku_bugfix
         fileid_dict = {}
         for stream in data['stream']:
             format = stream.get('stream_type')