x86 merge fallout: uml