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