add readme.txt
edit readme.txt
AND simple
& simple
conflict fixed
add merge
merge with --no-ff