docs(cn): dissolve the conflict

Author: NoiseFan

api/expect.md

@@ -1011,7 +1011,7 @@ it('render basic', async () => {
 - **类型:** `(snapshot?: string, hint?: string) => void`
 
 与 [`toMatchInlineSnapshot`](#tomatchinlinesnapshot) 类似，但期望的值与 [`toThrow`](#toThrow) 相同。
-
+<!-- TODO: translation -->
 ## toMatchAriaSnapshot <Version type="experimental">4.1.4</Version> <Experimental /> {#tomatcharisnapshot}
 
 - **Type:** `() => void`

guide/browser/aria-snapshots.md

@@ -2,7 +2,7 @@
 title: ARIA Snapshots | Guide
 outline: deep
 ---
-
+<!-- TODO: translation -->
 # ARIA Snapshots <Badge type="warning">experimental</Badge> <Version>4.1.4</Version>
 
 ARIA snapshots let you test the accessibility structure of your pages. Instead of asserting against raw HTML or visual output, you assert against the accessibility tree — the same structure that screen readers and other assistive technologies use.

guide/reporters.md

@@ -421,12 +421,9 @@ JSON 报告示例:
 ```
 
 ::: info
-自Vitest 3起，如果启用了代码覆盖率功能，JSON 报告器会在 `coverageMap` 中包含覆盖率信息。
+自Vitest 3 起，如果启用了代码覆盖率功能，JSON 报告器会在 `coverageMap` 中包含覆盖率信息。
 :::
-
-<<<<<<< HEAD
-### HTML 报告器 {#html-reporter}
-=======
+<!-- TODO: translation -->
 The `meta` field in each assertion result can be filtered via the `filterMeta` reporter option. It receives the key and value of each field and should return a falsy value to exclude the field from the report:
 
 ```ts
@@ -440,9 +437,7 @@ export default defineConfig({
   },
 })
 ```
-
-### HTML Reporter
->>>>>>> 5755951bae9c1f29ead80a0df48c81f2d0a46248
+### HTML 报告器 {#html-reporter}
 
 生成 HTML 文件，通过交互式 [GUI](/guide/ui) 查看测试结果。文件生成后，Vitest 将保持本地开发服务器运行，并提供一个链接，以便在浏览器中查看报告。
 

guide/snapshot.md

@@ -123,10 +123,7 @@ test('button looks correct', async () => {
 ```
 
 它会捕获屏幕截图并与参考图像进行比较，以检测意外的视觉变化。在 [视觉回归测试指南](/guide/browser/visual-regression-testing)中了解更多内容。
-
-<<<<<<< HEAD
-## 自定义序列化器 {#custom-serializer}
-=======
+<!-- TODO: translation -->
 ## ARIA Snapshots <Badge type="warning">experimental</Badge> <Version>4.1.4</Version>
 
 ARIA snapshots capture the accessibility tree of a DOM element and compare it against a stored template. Based on [Playwright's ARIA snapshots](https://playwright.dev/docs/aria-snapshots), they provide a semantic alternative to visual regression testing — asserting structure and meaning rather than pixels.
@@ -159,8 +156,7 @@ test('navigation structure', async () => {
 
 See the dedicated [ARIA Snapshots guide](/guide/browser/aria-snapshots) for syntax details, retry behavior in Browser Mode, and file vs. inline snapshot examples. See [`toMatchAriaSnapshot`](/api/expect#tomatcharisnapshot) and [`toMatchAriaInlineSnapshot`](/api/expect#tomatchariainlinesnapshot) for the full API reference.
 
-## Custom Serializer
->>>>>>> 5755951bae9c1f29ead80a0df48c81f2d0a46248
+## 自定义序列化器 {#custom-serializer}
 
 你可以添加自己的逻辑来修改快照的序列化方式。像 Jest 一样，Vitest 默认有内置的 JavaScript 类型、HTML 元素、ImmutableJS 和 React 元素提供了默认的序列化程序。
 
@@ -327,10 +323,7 @@ declare module 'vitest' {
 ::: tip
 See [Extending Matchers](/guide/extending-matchers) for more on `expect.extend` and custom matcher conventions.
 :::
-
-<<<<<<< HEAD
-## 与 Jest 的区别 {#difference-from-jest}
-=======
+<!-- TODO: translation -->
 ## Custom Snapshot Domain <Badge type="warning">experimental</Badge> <Version>4.1.4</Version> {#custom-snapshot-domain}
 
 Custom serializers control how values are _rendered_ into snapshot strings, but comparison is still string equality. A **domain snapshot adapter** goes further: it owns the entire comparison pipeline for a custom matcher, including how to capture a value, render it, parse a stored snapshot, and match them semantically.
@@ -517,8 +510,7 @@ test('user data inline', () => {
 })
 ```
 
-## Difference from Jest
->>>>>>> 5755951bae9c1f29ead80a0df48c81f2d0a46248
+## 与 Jest 的区别 {#difference-from-jest}
 
 Vitest 提供了与 [Jest](https://jestjs.io/docs/snapshot-testing) 几乎兼容的快照功能，除少数例外: