Changing more stuff
Merge branch 'TestBranch1'

Conflicts:
	My File 2.txt
	My File.txt