diff --git a/git-merge-conflict.md b/git-merge-conflict.md
index 2ca2e96..5b0e6a7 100644
--- a/git-merge-conflict.md
+++ b/git-merge-conflict.md
@@ -1,3 +1,3 @@
 # git merge
 
-合并冲突
+merge conflicts / 合并冲突