conflict elimination