FIXUP - "change-conflict" problem code.