branch test 1
branch test 2
branch test
branch test 2
Merge branch 'refs/heads/test'

Conflicts:
	test2