removed some conflicts