diff --git a/1.txt b/1.txt
index e7735a5..0b312af 100644
--- a/1.txt
+++ b/1.txt
@@ -1,2 +1,3 @@
 111
-wenbeiyuan_branch1
\ No newline at end of file
+wenbeiyuan_branch1
+wenbeiyuan_branch2
\ No newline at end of file
diff --git a/2/2.txt b/2/2.txt
new file mode 100644
index 0000000..43f193f
--- /dev/null
+++ b/2/2.txt
@@ -0,0 +1 @@
+验证合并操作
\ No newline at end of file