branch test
AND simple
& simple
AND fixed
add merge
merge with no-ff
fie bug 101
merged bug fix 101