Merge @types When Include

TBD - @types in base concepts should be merged with @types when included