add a branch
AND Simple
AND simple 2
&
conflict fixed
add a dev
merge with no-ff
fix bug 101
merge fix bug 101
commit before stash