Modified file.txt
Fixed conflict in file.txt