branch test
AND simple
& simple
& simple
add merge
merge with no-ff
stash
Merge branch 'dev'