fix conflicts

gatsby-config.js

index.d.ts

index.js

package.json

src/components/core/Badge.tsx

src/components/core/Card.tsx

src/components/core/Logo.tsx

src/components/core/Map.tsx

src/components/core/Toc.tsx

src/components/core/card/CardImage.tsx

src/components/core/utils/hook.tsx

src/pages-doc/doc/core/badge.tsx

src/pages-doc/doc/core/card.tsx

src/pages-doc/doc/core/index.tsx

src/pages-doc/doc/core/logo.tsx

src/pages-doc/doc/core/map.tsx

src/pages-doc/doc/core/toc.tsx