#7042 Diff/Merge Editor loses type during aggregations and falls back to Resource

In the Diff merge editor, the name and type are not displayed for aggregated resources: