branch test
AND simple
& simple
conflict fixed
fix bug 101
merged bugfix 101