C4
C5
Merge branch 'Branch2'

Conflicts:
	file2.txt