create branch dev again
AND simple
& simple
conflict fixed
fast forward
add merge
merge with no-ff
recovery
fix bug 101
merged bug fix 101
test bug branch
merge from dev branch