[OE-3987] conflicts will be stored in a separate table