branch test
AND simple
 & simple
conflict fixed
modify test.txt
add merge
merge with no-ff
modify
fix bug 101
fix bug 101
merged bug fix 101