router冲突

src/router/router.tsx

@@ -2,18 +2,7 @@ import React from 'react';
 import { Navigate, RouteObject } from 'react-router-dom';
 import ErrorPage from '~/pages/common/error';
 import LayoutView from '~/components/layout';
-<<<<<<< HEAD
 import { AccountBookOutlined, MacCommandOutlined ,GiftOutlined,PayCircleOutlined} from '@ant-design/icons';
-=======
-import {
-  AccountBookOutlined,
-  BarsOutlined,
-  MacCommandOutlined,
-  ShopOutlined,
-  CreditCardOutlined,
-  ShoppingOutlined,
-} from '@ant-design/icons';
->>>>>>> 6b4387b5925df322c6d7c37e64e4fc9eea147962
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import { AgnosticIndexRouteObject } from '@remix-run/router';