Update New Text Document.txt

removed conflict string