AND simple
& simple
conflict fixed
add merge
conflict fixed second
merge with no-ff
add merge second
stash test