diff --git a/HelloWorld.py b/HelloWorld.py
index ef01310..e228ac7 100755
--- a/HelloWorld.py
+++ b/HelloWorld.py
@@ -5,3 +5,5 @@
 import os,sys,time
 print(time.ctime()+" Hello World !")
 print('\n'.join(sys.path))
+print("master merge test after rebase test is esaier")
+print("the same branch for merge for test 2")
diff --git a/README b/README
index 0de8376..3381e53 100644
--- a/README
+++ b/README
@@ -60,6 +60,6 @@ then commit again in master for README:
 20131029 for merge in merge1
 
 创建分支合并后不删除分支，到分支上再开发了一下。
-
+-for merge conflect:1-