diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 7028ed05f..687994045 100644
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -194,14 +194,10 @@ from .chirbit import (
     ChirbitProfileIE,
 )
 from .cinchcast import CinchcastIE
-<<<<<<< HEAD
 from .ciscolive import (
     CiscoLiveSessionIE,
     CiscoLiveSearchIE,
 )
-=======
-from .ciscolive import CiscoLiveIE
->>>>>>> 2f72407593d15549a1ec6830a3cb5d7b4ad0b22b
 from .cjsw import CJSWIE
 from .cliphunter import CliphunterIE
 from .clippit import ClippitIE