test
comment
commit in test1_branch
commit in master_branch
commit
test
commit in hotfix_branch
commit another in hotfix_branch
commit 6th in hotfix_branch
commit 7th hot fix
commit in test1_branch
Merge branch 'master' into test1_branch

Conflicts:
	1.txt
8th in master_brahcn
comment 5th in test_branch
Merge branch 'master' into test1_branch

Conflicts:
	1.txt
commit in 6th test1_branch