Chencage to f.txt
change to f.txt1
resolve conflict