master 1
master 2
master 3
sub branch 1
master 4
hot fix 1
master 555
Merge branch 'master'

Conflicts:
	HelloWorld.txt
Merge branch 'hot-fix'
a
Merge branch 'sub-branch'

Conflicts:
	HelloWorld.txt
sub 2
main 333
Merge branch 'sub-branch'

Conflicts:
	HelloWorld.txt