commit 1
Finish feature-1
hot change 1
Finish hotfix-1
Finish hotfix-1

Conflicts:
	readme.txt
Finish hotfix-1
asdfasdf
Finish feature-1
Finish release-1

Conflicts:
	readme.txt
asd
Finish feature-1
stage error 1
Finish release-1

Conflicts:
	readme.txt