[OE-3987] updates to support conflict detection and resolution