branch test
a new branch
another new branch
conflict fixed
a new dev
merge with no-ff
fix bug 101
merged bug fix 101