Update conflict_file.txt