[OE-3987] conflict resolution