diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
index 495c51f5495..6cdb3906bbe 100644
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -1,9 +1,5 @@
 # CHANGELOG
 
-### Feats
-
-- `n-menu` add `accordion` prop , closes [#917](https://github.com/TuSimple/naive-ui/issues/917).
-
 ## Pending
 
 ### Breaking Changes
@@ -13,11 +9,13 @@
 ### Feats
 
 - `n-layout-sider` add `collapsed-trigger-style` prop.
+- `n-menu` add `accordion` prop , closes [#917](https://github.com/TuSimple/naive-ui/issues/917).
 - `n-input-number` add `readonly` prop , closes [#1198](https://github.com/TuSimple/naive-ui/issues/1198).
 
 ### Fixes
 
 - Fix `n-select` focus input when closing tag with `filterable` , closes [#1170](https://github.com/TuSimple/naive-ui/issues/1170).
+- Fix `n-button` border on hover conflicts with `n-badge`, closes [#1195](https://github.com/TuSimple/naive-ui/issues/1195).
 
 ## 2.18.2 (2021-09-14)
 
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index 95eff332670..2c551a3420e 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -1,9 +1,5 @@
 # CHANGELOG
 
-### Feats
-
-- `n-menu` 添加 `accordion` 属性，关闭 [#917](https://github.com/TuSimple/naive-ui/issues/917)
-
 ## Pending
 
 ### Breaking Changes
@@ -13,11 +9,13 @@
 ### Feats
 
 - `n-layout-sider` 新增 `collapsed-trigger-style` 属性
+- `n-menu` 添加 `accordion` 属性，关闭 [#917](https://github.com/TuSimple/naive-ui/issues/917)
 - `n-input-number` 新增 `readonly` 属性，关闭 [#1198](https://github.com/TuSimple/naive-ui/issues/1198)
 
 ### Fixes
 
 - 修复 `n-select` `filterable` 下关闭标签 input 光标聚焦问题，关闭 [#1170](https://github.com/TuSimple/naive-ui/issues/1170)
+- 修复 `n-button` 在 hover 状态下边框与 `n-badge` 冲突，关闭 [#1195](https://github.com/TuSimple/naive-ui/issues/1195)
 
 ## 2.18.2 (2021-09-14)
 
diff --git a/src/badge/src/styles/index.cssr.ts b/src/badge/src/styles/index.cssr.ts
index c7f0976254f..6c8b324ab5f 100644
--- a/src/badge/src/styles/index.cssr.ts
+++ b/src/badge/src/styles/index.cssr.ts
@@ -69,6 +69,7 @@ export default c([
       left: 100%;
       bottom: calc(100% - 9px);
       font-variant-numeric: tabular-nums;
+      z-index: 1;
     `,
     [
       fadeInScaleUpTransition({