diff --git a/1.txt b/1.txt
deleted file mode 100644
index 3822829..0000000
--- a/1.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-<<<<<<< HEAD
-branch1
-=======
-陈帅666
-gwx99
-branch_g
->>>>>>> remotes/origin/main