Branch 2
Merge again.
Merge branch 'branch2'

Conflicts:
	hi.txt