Update newfile.txt

conflict