xxxxx
com 2
master 1
Merge branch 'branch1'

Conflicts:
	master.txt