[OE-3987] beginning of conflict system