diff --git a/config/setup/easysearch/template_ilm.tpl b/config/setup/easysearch/template_ilm.tpl
index a8586fb6..1ab7a4bf 100644
--- a/config/setup/easysearch/template_ilm.tpl
+++ b/config/setup/easysearch/template_ilm.tpl
@@ -381,6 +381,12 @@ PUT _template/$[[SETUP_INDEX_PREFIX]]alert-history-rollover
       }
     },
     "mappings" : {
+      "properties" : {
+          "condition_result" : {
+            "type" : "object",
+            "enabled" : false
+          }
+      },
       "dynamic_templates" : [
         {
           "strings" : {
diff --git a/docs/content.en/docs/release-notes/_index.md b/docs/content.en/docs/release-notes/_index.md
index 5013a837..c98f0c15 100644
--- a/docs/content.en/docs/release-notes/_index.md
+++ b/docs/content.en/docs/release-notes/_index.md
@@ -22,6 +22,7 @@ Information about release notes of INFINI Console is provided here.
 - Fixed the wrong display of heatmap's data in alerting message (#157)
 - Fixed Devtools `_sql` support for elasticsearch 6.x (#158)
 - Fixed audit log default sorting across pagination (#161)
+- Fixed mapping type conflict error (#164)
 
 ### Improvements
 - Update agent config with cluster name (#148)
diff --git a/docs/content.zh/docs/release-notes/_index.md b/docs/content.zh/docs/release-notes/_index.md
index bb530e00..99966f33 100644
--- a/docs/content.zh/docs/release-notes/_index.md
+++ b/docs/content.zh/docs/release-notes/_index.md
@@ -22,6 +22,7 @@ title: "版本历史"
 - 修复告警消息热图数据显示错误的问题 (#157)
 - 修复开发工具 `_sql` 查询支撑 Elasticsearch 6.x 版本 (#158)
 - 修复审计日志默认排序翻页之后丢失的问题 (#161)
+- 修复 `Mapping` 冲突问题 (#161)
 
 ### Improvements
 - 优化下发给 Agent 的配置，增加集群名称 (#148)