edited newbranchfile1.txt
forgot to commit and lost file, new file
edited file2.txt
Merge branch 'Testing_New_Files'

Made changes in branch Testing_New_Files, now merging
edited README.txt to cause conflict
corrected merge conflict