update file.txt local
fixed merge conflict