branch test
AND simple
& simple
conflict fixed
add merge
merge with on merge
diff -- different
merge bug fix 101
bug fixed early
after debug 101