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