resolve some conflicts