diff --git a/package.json b/package.json
index 0b4dd0d..aa27123 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,5 @@
 {
   "name": "hexo-theme-butterfly",
-<<<<<<< HEAD
-  "version": "5.2.1",
-=======
   "version": "5.2.2",
   "description": "A Simple and Card UI Design theme for Hexo",
   "main": "package.json",