resolving some conflicts