branch 2 commit 1
branch 2 commit 2
commit 4
Merge remote-tracking branch 'origin/branch2'

Conflicts:
	testfile1.txt