branch3 commit1
branch3 commit2
Merge remote-tracking branch 'origin/master' into branch3

Conflicts:
	testfile1.txt
branch3 commit3
Merge remote-tracking branch 'origin/master' into branch3
master commit10