Merge... type now lives inside common.typesystem