add merge
merge with no-ff
fix bug 1
merged bug fix  1
update gittest.txt
merge gittest