fix some conflicts