branch test
AND simple
& simple
conflict fixed
add merge
merwith no-ff
fix bug 101
add good
merged bug fix 101 2th