fine-tuning and correcting set conflict handling