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