branch text
AND simple
& simple
conflict fixed
fix bug 101
merge bug fix 101