branch text
branch test 2
AND simple
& simple
conflict fixed
no-ff
merge with no-ff
fix bug 101
merge bug fix 101