Treating the nvd cluster differently
Conflict fixed