a little merge fixup