client modify the new1.txt file
resolve the conflicts on new1.txt file