branch test
AND is simple
& simple
conflict fixed
add a
fix bug -1-1
merge bug fix -1-1