remove some conflicts