diff --git a/local_submit.txt b/local_submit.txt
index d800886..9e68635 100644
--- a/local_submit.txt
+++ b/local_submit.txt
@@ -1 +1,5 @@
-123
\ No newline at end of file
+<<<<<<< HEAD
+123
+=======
+需要重置
+>>>>>>> 88ad302fc503373c17f9922d5b07486a4d6d9ee7