conflicts are all resolved.