branch test
AND simple
& simple
conflict fixed
modify dev
merge with no-ff
to fast forward
merge fast forward
fix bug 101
dev finish
conflict fixed finish