Remove some conflicts