Fixes a sneaky merge conflict