branch commit 1
add branch1 first file
master commit 2
Merge branch 'branch1'

Conflicts:
	file1