solve some conflicts