diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index a225f40cf..71713f63a 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -2831,11 +2831,7 @@ def dfxp2srt(dfxp_data):
                     self._applied_styles.pop()
 
         def data(self, data):
-<<<<<<< HEAD
-            self._out += data.strip()
-=======
             self._out += data
->>>>>>> [streamango] add support for streamcherry.com (#20592)
 
         def close(self):
             return self._out.strip()