AND aimple
& simple
conflict fied
add merge
merge with no-ff