second develop commit
fist hotfix commit
second hotfix commit
third hotfix commit
third develop commit
four develop commit
Merge branch 'develop'

Conflicts:
	main.txt