docs(cn): dissolve the conflict

Author: NoiseFan

api/browser/locators.md

@@ -12,7 +12,7 @@ outline: [2, 3]
 ::: tip
 本页介绍了 API 的使用。为了更好地了解定位器及其用法，请阅读 [Playwright 的“定位器”文档](https://playwright.dev/docs/locators)。
 :::
-
+<!-- TODO: translation -->
 ::: tip Difference from `testing-library`
 Vitest's `page.getBy*` methods return a locator object, not a DOM element. This makes locator queries composable and allows Vitest to retry interactions and assertions when needed.
 

guide/common-errors.md

@@ -123,7 +123,7 @@ vitest --pool=forks
 ```
 
 :::
-
+<!-- TODO: translation -->
 ## Unhandled Promise Rejection
 
 This error happens when a Promise rejects but no `.catch()` handler or `await` is attached to it before the microtask queue flushes. This behavior comes from JavaScript itself and is not specific to Vitest. Learn more in the [Node.js documentation](https://nodejs.org/api/process.html#event-unhandledrejection).

guide/recipes.md

@@ -15,17 +15,6 @@ export default defineConfig({
   test: {
     projects: [
       {
-<<<<<<< HEAD
-        // 禁用隔离的单元测试
-        name: 'Unit tests',
-        isolate: false,
-        exclude: ['**.integration.test.ts'],
-      },
-      {
-        // 集成隔离的测试
-        name: 'Integration tests',
-        include: ['**.integration.test.ts'],
-=======
         test: {
           // Non-isolated unit tests
           name: 'Unit tests',
@@ -39,7 +28,6 @@ export default defineConfig({
           name: 'Integration tests',
           include: ['**.integration.test.ts'],
         },
->>>>>>> 533b7d49f571f3024e559dee4f55f67d7212a838
       },
     ],
   },