master1
master2
temp4
Merge branch 'temp1'

Conflicts:
	file2.xml