Hotfix file was created
New line into hotfix
new file
qew
sadffds
Merge branch 'hotfix'

Conflicts:
	new_in_hot_fix.txt

etr