diff --git a/user1.txt b/user1.txt
index 593f7d262122002cea4b00f99099281b1bf5686f..bfc0bd89bd4306c36c57b66ce7c7e25c860ae26c 100644
--- a/user1.txt
+++ b/user1.txt
@@ -4,4 +4,7 @@ user1 第一次提交
 第二次合并
 
 a 修改了 user1.txt 文件 aaaaaa
-a2
\ No newline at end of file
+a2
+
+
+b是b
\ No newline at end of file
diff --git a/user2.txt b/user2.txt
index a629ee4e033fb76c9c13da66f6295649ad30b93f..296ba13cb4d6e775383cf7c430bc0b7a51f22699 100644
--- a/user2.txt
+++ b/user2.txt
@@ -1,3 +1,3 @@
 b增加了一个文件 user2.txt
 
-bbbbbbb
\ No newline at end of file
+b2 b2