Hotfix: Merge conflict