Updating 3 and 4
Merge branch 'TestBranch1'

Conflicts:
	My File.txt