Branch1
branch1 change 2
Merge remote-tracking branch 'remotes/origin/branch1'

Conflicts:
	test.txt