add test2.txt
hehe
brach test
add merge
merge with no-ff
haha