add a readme.txt file
add a new line
use &
conflict fixed
a new modify
merge with no-ff
fix bug 101
merged bug fix 101