Conflicts should be resolved.