delete lines
Apply hotfix
Merge branch 'hotfix'

Conflicts:
	rogerskwFile.txt
Merge branch 'iss1'