update file1.txt by daifeng
merge file1.txt by daifeng