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