docs(cn): dissolve the conflict

Author: NoiseFan

guide/extending-matchers.md

@@ -107,16 +107,12 @@ function customMatcher(this: MatcherState, received: unknown, arg1: unknown, arg
 
 expect.extend({ customMatcher })
 ```
-
-<<<<<<< HEAD
-断言方法可以访问上下文 `this` 对象中的这些属性:
-=======
+<!-- TODO: translation -->
 ::: tip
 To build custom **snapshot matchers** (wrappers around `toMatchSnapshot` / `toMatchInlineSnapshot` / `toMatchFileSnapshot`), use the composable functions from `vitest/runtime`. See [Custom Snapshot Matchers](/guide/snapshot#custom-snapshot-matchers).
 :::
 
-Matcher function has access to `this` context with the following properties:
->>>>>>> 7bcfba99069917ceca25fdcb80d58c38fdcd7233
+断言方法可以访问上下文 `this` 对象中的这些属性:
 
 ## `isNot`
 

guide/migration.md

@@ -640,10 +640,7 @@ export default defineConfig({
 ```
 
 否则快照中会出现大量转义的 `"` 字符。
-
-<<<<<<< HEAD
-## 从 Mocha + Chai + Sinon 迁移 {#mocha-chai-sinon}
-=======
+<!-- TODO: translation -->
 ### Custom Snapshot Matchers <Badge type="warning">experimental</Badge> <Version>4.1.3</Version>
 
 Jest imports snapshot composables from `jest-snapshot`. In Vitest, import from `vitest/runtime` instead:
@@ -674,8 +671,7 @@ expect.extend({
 
 See [Custom Snapshot Matchers](/guide/snapshot#custom-snapshot-matchers) for the full guide.
 
-## Migrating from Mocha + Chai + Sinon {#mocha-chai-sinon}
->>>>>>> 7bcfba99069917ceca25fdcb80d58c38fdcd7233
+## 从 Mocha + Chai + Sinon 迁移 {#mocha-chai-sinon}
 
 Vitest 对从 Mocha+Chai+Sinon 测试套件迁移提供了完善支持。虽然 Vitest 默认使用与 Jest 兼容的 API，但它同时也提供 Chai 风格的断言用于 spy/mock 测试，从而降低迁移成本。
 

guide/snapshot.md

@@ -192,10 +192,7 @@ Pretty foo: Object {
 ```
 
 我们使用的是 Jest 的 `pretty-format` 来序列化快照。你可以在这里阅读更多相关内容：[pretty-format](https://github.com/facebook/jest/blob/main/packages/pretty-format/README.md#serialize).
-
-<<<<<<< HEAD
-## 与 Jest 的区别 {#difference-from-jest}
-=======
+<!-- TODO: translation -->
 ## Custom Snapshot Matchers <Badge type="warning">experimental</Badge> <Version>4.1.3</Version> {#custom-snapshot-matchers}
 
 You can build custom snapshot matchers using the composable functions exported from `vitest/runtime`. These let you transform values before snapshotting while preserving full snapshot lifecycle support (creation, update, inline rewriting).
@@ -266,8 +263,7 @@ declare module 'vitest' {
 See [Extending Matchers](/guide/extending-matchers) for more on `expect.extend` and custom matcher conventions.
 :::
 
-## Difference from Jest
->>>>>>> 7bcfba99069917ceca25fdcb80d58c38fdcd7233
+## 与 Jest 的区别 {#difference-from-jest}
 
 Vitest 提供了与 [Jest](https://jestjs.io/docs/snapshot-testing) 几乎兼容的快照功能，除少数例外: