merged hotfix conflict