branch test
readme.txt has been changed
AND simple
& simple
conflict fixed
add merege
merge with no-ff