solved some conflicts