merge fixups