AND simple
& simple
conflict fixed
add merge
conflict fixed second
merge with no-ff
merge with no-ff
add merge second
merge with no-ff second
fix bug 101
merged bug fix 101
stash test
merge for stash