fix(gatsby): merge resolveType when merging abstract types (#31710)#31723

LekoArts merged 1 commit intorelease/3.6gatsbyjs/gatsby:release/3.6from

backport-3.6-31710gatsbyjs/gatsby:backport-3.6-31710Copy head branch name to clipboard