diff --git a/plugin-dev-en/0411-tool.mdx b/plugin-dev-en/0411-tool.mdx
index a11b6580..20e512ff 100644
--- a/plugin-dev-en/0411-tool.mdx
+++ b/plugin-dev-en/0411-tool.mdx
@@ -105,7 +105,7 @@ identity:
   label:
     en_US: label
     zh_Hans: 标签
-    ja_JP: レベル
+    ja_JP: ラベル
     pt_BR: etiqueta
 description:
   human:
diff --git a/plugin-dev-en/0412-model-schema.mdx b/plugin-dev-en/0412-model-schema.mdx
index 2b39166b..bb6842e8 100644
--- a/plugin-dev-en/0412-model-schema.mdx
+++ b/plugin-dev-en/0412-model-schema.mdx
@@ -15,11 +15,7 @@ description: This document provides detailed interface specifications required f
   various model integrations.
 ---
 
-<<<<<<< HEAD
 This section introduces the interface methods and parameter descriptions that providers and each model type need to implement. Before developing a model plugin, you may first need to read [Model Design Rules](/plugin-dev-en/0411-model-designing-rules) and [Model Plugin Introduction](/plugin-dev-en/0131-model-plugin-introduction).
-=======
-This section introduces the interface methods and parameter descriptions that providers and each model type need to implement. Before developing a model plugin, you may first need to read [Model Design Rules](/plugin-dev-en/0411-model-designing-rules) and [Model Plugin Introduction](/plugin-dev-en/0411-model-plugin-introduction).
->>>>>>> main
 
 ### Model Provider
 
diff --git a/plugin-dev-ja/0411-tool.mdx b/plugin-dev-ja/0411-tool.mdx
index a80790a9..3ce8344d 100644
--- a/plugin-dev-ja/0411-tool.mdx
+++ b/plugin-dev-ja/0411-tool.mdx
@@ -102,7 +102,7 @@ identity:
   label:
     en_US: label
     zh_Hans: 标签
-    ja_JP: レベル
+    ja_JP: ラベル
     pt_BR: etiqueta
 description:
   human:
diff --git a/plugin-dev-zh/0411-tool.mdx b/plugin-dev-zh/0411-tool.mdx
index c920b6ca..87c2a991 100644
--- a/plugin-dev-zh/0411-tool.mdx
+++ b/plugin-dev-zh/0411-tool.mdx
@@ -102,7 +102,7 @@ identity:
   label:
     en_US: label
     zh_Hans: 标签
-    ja_JP: レベル
+    ja_JP: ラベル
     pt_BR: etiqueta
 description:
   human: