Added hotfix.txt
Modified hotfix.txt
Added text to hotfix.txt
Fixed conflict, used master branch alternative