fixing properties in data cartridges
fixing conflicts