diff --git a/local_submit.txt b/local_submit.txt
index 9e68635..a2c065f 100644
--- a/local_submit.txt
+++ b/local_submit.txt
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-123
-=======
+
 需要重置
->>>>>>> 88ad302fc503373c17f9922d5b07486a4d6d9ee7
+