add file test.txt
merge & add test.txt