on branch1.
merge master into branch1.

Merge branch 'master' into branch1

Conflicts:
	file1
changed file2.
Merge branch 'branch2'
Merge branch 'branch1'