Fixes a merge-related bug