branch test
and simple
& simple
conflict fixed
dev
merge with no-ff
fix bug 101
merged bug fix 101
dev again
merge with no-ff