docs(cn): dissolve the conflict (#841)

* docs(cn): update package.json

* docs(cn): dissolve the conflict

* ci(lint): update eslint config

* fix: failed lint

* fix: failed lint

* fix: failed lint

* [autofix.ci] apply automated fixes

* docs(cn): update cli-generated

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

Author: NoiseFan

.vitepress/components/FeaturesList.vue

@@ -1,22 +1,5 @@
 <template>
-<<<<<<< HEAD
   <ul class="features-list" dir="auto" flex="~ col gap2 md:gap-3">
-=======
-  <ul
-    class="features-list"
-    dir="auto"
-    flex="~ col gap2 md:gap-3"
-  >
-    <ListItem><a target="_blank" href="https://vitejs.dev" rel="noopener noreferrer">Vite</a>'s config, transformers, resolvers, and plugins</ListItem>
-    <ListItem>Use the same setup from your app to run the tests!</ListItem>
-    <ListItem>Smart & instant watch mode, like HMR for tests!</ListItem>
-    <ListItem>Component testing for Vue, React, Svelte, Lit, Marko and more</ListItem>
-    <ListItem>Out-of-the-box TypeScript / JSX support</ListItem>
-    <ListItem>ESM first, top level await</ListItem>
-    <ListItem>Benchmarking support with <a target="_blank" href="https://github.com/tinylibs/tinybench" rel="noopener noreferrer">Tinybench</a></ListItem>
-    <ListItem>Filtering, timeouts, concurrent for suite and tests</ListItem>
-    <ListItem><a href="/guide/projects">Projects</a> support</ListItem>
->>>>>>> 63c27c40d2833c42ec624f3076c90acd960fe8f9
     <ListItem>
       与
       <a target="_blank" href="https://vitejs.dev" rel="noopener noreferrer">Vite</a>
@@ -50,7 +33,8 @@
     </ListItem>
     <ListItem>
       内置
-      <a target="_blank" href="https://github.com/Aslemammad/tinyspy" rel="noopener noreferrer">Tinyspy</a> 用于对象 Mock
+      <a target="_blank" href="https://github.com/Aslemammad/tinyspy" rel="noopener noreferrer">Tinyspy</a> 用于对象
+      Mock
     </ListItem>
     <ListItem>
       使用