modify a file from another guy
fix the conflict 1.txt