[OE-3987] conflict resolution for episodes