some conflicts solved