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