diff --git a/hello git.txt b/hello git.txt
index 0207857..b576f85 100644
--- a/hello git.txt	
+++ b/hello git.txt	
@@ -1 +1,5 @@
+<<<<<<< HEAD
 1版本
+=======
+2版本
+>>>>>>> 2_branch