solving some conflicts