diff --git a/DB.py b/DB.py
index eaaf227..2790b1e 100644
--- a/DB.py
+++ b/DB.py
@@ -339,7 +339,6 @@ class DBVidcon:
             items = []
         return items
 
-
     @redis_retry(max_retries=3)
     def item_keyword(self, count: int = 20):
         try:
@@ -407,26 +406,14 @@ class DBVidcon:
     @mysql_retry()
     def get_subsequent_report_video(self, did: int):
         sql = """
-<<<<<<< HEAD
               SELECT DISTINCT report_id
               FROM sh_dm_fight_records
               WHERE status = 2
-                AND subsequent_status = 1
+                AND subsequent_status in (1, 3)
                 AND report_time != ''
-        AND mid = %s \
+        AND mid = %s 
               """
         self.cursor.execute(sql, did)
-=======
-    SELECT DISTINCT report_id
-    FROM sh_dm_fight_records
-    WHERE
-        status = 2
-        AND subsequent_status in (1, 3)
-        AND report_time != ''
-        AND mid = %s
-        """
-        self.cursor.execute(sql,did)
->>>>>>> origin/main
         return self.cursor.fetchall()
 
     @mysql_retry()