fix wrong conflict resolve

apps/app/src/client/components/ReactMarkdownComponents/Header.tsx

@@ -3,8 +3,8 @@ import { useRouter } from 'next/router';
 import { globalEventTarget } from '@growi/core/dist/utils';
 import type { Element } from 'hast';
 
-import { NextLink } from '~/components/ReactMarkdownComponents/NextLink';
 import { useStartEditing } from '~/client/services/use-start-editing';
+import { NextLink } from '~/components/ReactMarkdownComponents/NextLink';
 import {
   useCurrentPageYjsData,
   useCurrentPageYjsDataLoading,

apps/app/src/client/components/ReactMarkdownComponents/LightBox.tsx

@@ -1,5 +1,6 @@
+import type React from 'react';
 import type { DetailedHTMLProps, ImgHTMLAttributes, JSX } from 'react';
-import React, { useMemo, useState } from 'react';
+import { useMemo, useState } from 'react';
 import FsLightbox from 'fslightbox-react';
 import { createPortal } from 'react-dom';
 

biome.json

@@ -29,6 +29,9 @@
       "!packages/pdf-converter-client/src/index.ts",
       "!packages/pdf-converter-client/specs",
       "!apps/app/src/client/components/Admin",
+      "!apps/app/src/client/components/DescendantsPageListModal",
+      "!apps/app/src/client/components/ItemsTree",
+      "!apps/app/src/client/components/LoginForm",
       "!apps/app/src/client/components/Page",
       "!apps/app/src/client/components/PageAttachment",
       "!apps/app/src/client/components/PageDeleteModal",