AND simple
& simple
conflict fixed
add merge1
merge with no--ff