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