Branch1 - modify1
Branch2 - Modify1
Merge branch 'Branch2' into Branch1

Conflicts:
	MyFile.txt