Made changes to Files 1 and 2 in Branch One
Merge branch 'One'

Conflicts:
	File1.txt
	File2.txt