diff --git a/1.txt b/1.txt
index 92869fe..3822829 100644
--- a/1.txt
+++ b/1.txt
@@ -1 +1,7 @@
-branch1
\ No newline at end of file
+<<<<<<< HEAD
+branch1
+=======
+陈帅666
+gwx99
+branch_g
+>>>>>>> remotes/origin/main
diff --git a/1.txt.txt b/1.txt.txt
new file mode 100644
index 0000000..9d07aa0
--- /dev/null
+++ b/1.txt.txt
@@ -0,0 +1 @@
+111
\ No newline at end of file