Adding missing conflict