on branch2.
Merge branch 'branch2'

Conflicts:
	file1