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