add some lines to merge1.txt
edit merge1.txt and test1.txt
change test1.txt file
modify readme.txt
update file merge1.txt
Merge branch 'branch'