conflicting change added in hotfix.txt
three deletes