gt branch test
AND simple
& simple
conflict fixed
test merge
merge with no ff
bug 101 fixed