Adding missing conflict and provide