Update file1
Merge remote-tracking branch 'origin/branch1' into branch1

Conflicts:
	file1
Update file2
Update file2
Update file2
Merge branch 'branch1'
Merge remote-tracking branch 'origin/master'