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

Conflicts:
	file1