Missed some conflicts