Branch1 init
Branch commit
Merge branch 'Branch1'
Test
Merge branch 'Branch1'

Conflicts:
	random.txt