hotfix for merge