update test3 on client
Merge remote-tracking branch 'origin/branch1' into branch1
commit test2 on client
Merge remote-tracking branch 'origin/branch1' into branch1

Conflicts:
	test2.txt