Fixed the vnfd-model which removed Adam's changes doing merge resolution

No match.