add merge
merge with no-ff
fix bug 101
merged bug fix 101
bug branch
merger bug branch
remove test.txt
merge remove test.txt