modified new_file.txt
merge new_file and resovle conflict