Missed some conflicts, fixed