add test.txt
add merge
add test
conflict fixed
add merge
merge with no-ff
fix bug 101
meged bug fix 101