Resolving some conflicts?