UTextFile.txt

NO!
Delete TestFile.txt
main.cpp

Main File
Update main.cpp
Merge branch 'Bob's-Branch'

Conflicts:
	TestFile.txt