Update newfile.txt

edit for manual merge conflict