Test 5
Merge branch '1.0.0/1111-test'
Merge remote-tracking branch 'remotes/test-server/master'
Test 7
Merge branch '1.0.0/1000-test'
Test 8
Merge branch '1.0.0/1112-test'
Merge remote-tracking branch 'remotes/test-server/master'

Conflicts:
	test5.txt