branch test
AND simple
& simple
confict fixd
add merge
merge with no-ff
fix bug 101
merged bug gix 101