resolve conflict

Signed-off-by: james <open4pd@4paradigm.com>

Author: DSFans2014

AGENTS.md

@@ -129,7 +129,7 @@ See `docs/contributor/contributing.md` (§ DCO Sign-off) and `docs/contributor/g
   - Core Concepts
   - Key Features
   - Get Started
-  - Installation (including device-specific guides for NVIDIA, Cambricon, Hygon, Mthreads, Iluvatar, Enflame, AWS Neuron, Kunlunxin, Metax, Ascend)
+  - Installation (including device-specific guides for NVIDIA, Cambricon, Hygon, Mthreads, Iluvatar, Enflame, AWS Neuron, Kunlunxin, MetaX, Ascend)
   - User Guide (with monitoring and device-specific subsections)
   - Developer Guide
   - Contributor Guide
@@ -320,6 +320,20 @@ The site uses Prism.js with additional languages:
 
 Add more in `docusaurus.config.js` under `prism.additionalLanguages`.
 
+### Mermaid Diagrams
+
+Mermaid blocks are rendered through a custom wrapper at `src/theme/Mermaid/index.js`. To give a diagram a visible caption, add a `%% title: <text>` line as the **first line inside the mermaid fence**:
+
+````
+```mermaid
+%% title: HAMi Ecosystem Integrations
+flowchart TB
+    A --> B
+```
+````
+
+The wrapper extracts that comment and renders it as a `<figcaption>` (the lightbox picks it up too). `%%` is otherwise a plain mermaid comment, so the title only appears because of this wrapper. Do **not** use mermaid's YAML frontmatter form (`---\ntitle: ...\n---`) — it is not rendered on this site.
+
 ### Custom Changelog Plugin Details
 
 The changelog plugin (`src/plugins/changelog/index.js`) is a customized Docusaurus blog plugin that:
@@ -361,7 +375,7 @@ Each device vendor has a dedicated section under `userguide/<Vendor>-device/`:
 - **Enflame (GCU)** - Chinese AI accelerator
 - **AWS Neuron** - AWS Inferentia/Trainium
 - **Kunlunxin (XPU)** - Chinese AI chip
-- **Metax** - Chinese GPU with topology-aware scheduling
+- **MetaX** - Chinese GPU with topology-aware scheduling
 - **Ascend** - Huawei NPU
 
 ### Translation Sync

CHANGELOG.md

@@ -218,7 +218,7 @@
 
 #### :rocket: Major features
 
-- Metax sGPU topology aware by ([@Kyrie336](https://github.com/Kyrie336)) in [#1193](https://github.com/Project-HAMi/HAMi/pull/1193)
+- MetaX sGPU topology aware by ([@Kyrie336](https://github.com/Kyrie336)) in [#1193](https://github.com/Project-HAMi/HAMi/pull/1193)
 - NVIDIA Resourcequota by ([@FouoF](https://github.com/FouoF)) in [#1359](https://github.com/Project-HAMi/HAMi/pull/1359)
 - Kunlunxin topology-aware scheduling by ([@FouoF](https://github.com/FouoF)) in [#1141](https://github.com/Project-HAMi/HAMi/pull/1141)
 - Kunlunxin vxpu sopport #1016 by ([@ouyangluwei163](https://github.com/ouyangluwei163)) ([@archlitchi](https://github.com/archlitchi)) in [#1337](https://github.com/Project-HAMi/HAMi/pull/1337)
@@ -277,7 +277,7 @@
 - Prerelease-v2.6 by ([@archlitchi](https://github.com/archlitchi)) in [#1108](https://github.com/Project-HAMi/HAMi/pull/1108)
 - add new reviewers Shouren and ouyangluwei163 by ([@wawa0210](https://github.com/wawa0210)) in [#1131](https://github.com/Project-HAMi/HAMi/pull/1131)
 - Support topology-awareness for Kunlunxin device by ([@archlitchi](https://github.com/archlitchi)) in [#1121](https://github.com/Project-HAMi/HAMi/pull/1121)
-- Support Metax sGPU Qos Policy by ([@Kyrie336](https://github.com/Kyrie336)) in [#1123](https://github.com/Project-HAMi/HAMi/pull/1123)
+- Support MetaX sGPU Qos Policy by ([@Kyrie336](https://github.com/Kyrie336)) in [#1123](https://github.com/Project-HAMi/HAMi/pull/1123)
 - add global image for chart by ([@calvin0327](https://github.com/calvin0327)) in [#1133](https://github.com/Project-HAMi/HAMi/pull/1133)
 - fix: Skip admission webhook when Pod's scheduler is already assigned. by ([@ghostloda](https://github.com/ghostloda)) in [#1041](https://github.com/Project-HAMi/HAMi/pull/1041)
 - Add node configs to docs by ([@wylswz](https://github.com/wylswz)) in [#1159](https://github.com/Project-HAMi/HAMi/pull/1159)
@@ -304,7 +304,7 @@
 - feat: Add an action of 'Close stale issue and PRs' in github worklfow by ([@Shouren](https://github.com/Shouren)) in [#1083](https://github.com/Project-HAMi/HAMi/pull/1083)
 - Welcome fyp711 to become a HAMi member by ([@wawa0210](https://github.com/wawa0210)) in [#1288](https://github.com/Project-HAMi/HAMi/pull/1288)
 - Add values readme by ([@clcc2019](https://github.com/clcc2019)) in [#1267](https://github.com/Project-HAMi/HAMi/pull/1267)
-- Support Metax sGPU device health check by ([@Kyrie336](https://github.com/Kyrie336)) in [#1295](https://github.com/Project-HAMi/HAMi/pull/1295)
+- Support MetaX sGPU device health check by ([@Kyrie336](https://github.com/Kyrie336)) in [#1295](https://github.com/Project-HAMi/HAMi/pull/1295)
 - Optimize pkg/util.go and distribute logics to corresponding logics by ([@archlitchi](https://github.com/archlitchi)) in [#1296](https://github.com/Project-HAMi/HAMi/pull/1296)
 - cleanup: Clear and correct ascend device name by ([@FouoF](https://github.com/FouoF)) in [#1315](https://github.com/Project-HAMi/HAMi/pull/1315)
 - bugfix: Nvidia card abnormal pod will still continue to schedule by ([@zgqqiang](https://github.com/zgqqiang)) in [#1336](https://github.com/Project-HAMi/HAMi/pull/1336)
@@ -385,7 +385,7 @@
 - support ascend 910B2 by ([@ouyangluwei163](https://github.com/ouyangluwei163)) in [#885](https://github.com/Project-HAMi/HAMi/pull/885)
 - fix docs typos by ([@JinVei](https://github.com/JinVei)) in [#869](https://github.com/Project-HAMi/HAMi/pull/869)
 - Accelerate node score calculations using multiple goroutines by ([@learner0810](https://github.com/learner0810)) in [#824](https://github.com/Project-HAMi/HAMi/pull/824)
-- Support Metax SGPU to sharing GPU by ([@Kyrie336](https://github.com/Kyrie336)) in [#895](https://github.com/Project-HAMi/HAMi/pull/895)
+- Support MetaX SGPU to sharing GPU by ([@Kyrie336](https://github.com/Kyrie336)) in [#895](https://github.com/Project-HAMi/HAMi/pull/895)
 - docs: fix broken commmunity links by ([@agilgur5](https://github.com/agilgur5)) in [#907](https://github.com/Project-HAMi/HAMi/pull/907)
 - add config gpu core isolation policy for webhook by ([@lengrongfu](https://github.com/lengrongfu)) in [#901](https://github.com/Project-HAMi/HAMi/pull/901)
 - feat: support scheduler replicas > 1 by ([@Azusa-Yuan](https://github.com/Azusa-Yuan)) in [#898](https://github.com/Project-HAMi/HAMi/pull/898)
@@ -428,7 +428,7 @@
 - Add nvidia gpu topoloy score registry to node by ([@lengrongfu](https://github.com/lengrongfu)) in [#1018](https://github.com/Project-HAMi/HAMi/pull/1018)
 - fix(cicd): update ci.yaml to upload coverage to Codecov by ([@Shouren](https://github.com/Shouren)) in [#1056](https://github.com/Project-HAMi/HAMi/pull/1056)
 - feat(Actions): Add an action to label pr automatically by ([@Shouren](https://github.com/Shouren)) in [#1053](https://github.com/Project-HAMi/HAMi/pull/1053)
-- fix: Improve Metax GPU usability and fix related issues by ([@Kyrie336](https://github.com/Kyrie336)) in [#1063](https://github.com/Project-HAMi/HAMi/pull/1063)
+- fix: Improve MetaX GPU usability and fix related issues by ([@Kyrie336](https://github.com/Kyrie336)) in [#1063](https://github.com/Project-HAMi/HAMi/pull/1063)
 - fix(chart): support GKE pre-release versions via kubeVersion '-0' by ([@Nimbus318](https://github.com/Nimbus318)) in [#1072](https://github.com/Project-HAMi/HAMi/pull/1072)
 - fix: Dynamic GPU partitioning lacks single-GPU-level granularity. (#1… by ([@Goend](https://github.com/Goend)) in [#1061](https://github.com/Project-HAMi/HAMi/pull/1061)
 - update maintainer information by ([@wawa0210](https://github.com/wawa0210)) in [#1079](https://github.com/Project-HAMi/HAMi/pull/1079)

OWNERS

@@ -3,6 +3,7 @@ reviewers:
 - wawa0210
 - windsonsea
 - rootsongjc
+- mesutoezdil
 approvers:
 - archlitchi
 - wawa0210

README.md

@@ -38,7 +38,7 @@ docs/
 
 ### Prerequisites
 
-- Node.js v20+ (configured in `.nvmrc`)
+- Node.js v20+
 - npm v10+
 
 ### Installation