branch test
& simple
AND simple
& simple
conflict fixed
add merge
add merge
fix bug 101
merged bug fix 101