Changing 3 to 123
Merge branch 'TestBranch1'

Conflicts:
	My File.txt
Adding 2nd file
Changing more stuff