corrected missing conflict