Merge branch 'origin/branch1'
b changed
Merge branch 'origin/master'

Conflicts:
	b.txt