change file1.txt
fix conflict