Conflicts resolved.