diff --git a/sub/sub_list.json b/sub/sub_list.json
index efc440e1c..d81618dd5 100644
--- a/sub/sub_list.json
+++ b/sub/sub_list.json
@@ -495,7 +495,6 @@
     "update_method": "auto",
     "enabled": true
   },
-<<<<<<< HEAD
   {
     "id": 62,
     "remarks": "songtao1873/providers",
@@ -504,8 +503,6 @@
     "update_method": "auto",
     "enabled": true
   },
-=======
->>>>>>> 2f97044c0c70742a6a8b7f7ef58990d1959e6dbf
   {
     "id": 63,
     "remarks": "Unknown",