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