add test.txt
add simple on fb1
add on master
fix merge
Add test.txt update
merge with no--ff