AND simple
& simple
& simple
add merge
merge with no-ff
add merge2
merge 2 with no-ff
add merge3
stash test
ignore