[OE-3987] versioning and conflicts