merge some conflicts