Resolve some conflicts