hotfix: merge error