another version conflict fixup