Fixes a merge issue