Resolving some conflicts