Update newfile.txt

conflict-2