conflicts are resolved