AND simple
& simple
conflict fixed
modify README
modify README &
conflict fixed.
add merge
merge with no-ff