add a new readme.txt file
modify the readme.txt
modify a file
conflict fixed
add merge
merge with no-ff
fix bug 101
merge bug fix 101