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
diff --git a/1.txt.txt b/1.txt.txt
index 9d07aa0..235f832 100644
--- a/1.txt.txt
+++ b/1.txt.txt
@@ -1 +1,5 @@
-111
\ No newline at end of file
+111
+branch_hjj
+gwx_work
+pull_request_gwx
+yqy_conduct
\ No newline at end of file