Hotfix, merge conflict