Branch2 checkin
Commit Merge.
Merge branch 'branch2'

Conflicts:
	hi.txt