added test.txt
merge & fix test.txt