hotfix with conflict
Merge branch 'branch_with_conflict'

Conflicts:
	hotfix.html

merged with conflict solved