branch commit 3
branch commit 4
commit 5
Merge branch 'test'

Conflicts:
	1.txt