fixed the bug in file.txt
Merge branch 'master' into verison1