resolved some conflicts