branch test
AND simple
& simple
conflict fixed
add merge
merge with no-ff
fix bug 101
Merge branch 'issue-101'
merge bug fix 101
test stash
Merge branch 'dev'
merge test stash