Another merge fixup