branch test
AND simple
& simple
conflict fixed
add merge
merge with no -ff
update change
fix bug 101
merged bug fix 101
commit dev change
fix conflict