diff --git a/install/package.json b/install/package.json
index b65cc0d1cb..6ca5fc4a4e 100644
--- a/install/package.json
+++ b/install/package.json
@@ -97,11 +97,7 @@
         "nodebb-plugin-dbsearch": "6.2.0",
         "nodebb-plugin-emoji": "5.1.5",
         "nodebb-plugin-emoji-android": "4.0.0",
-<<<<<<< HEAD
-        "nodebb-plugin-markdown": "12.2.2",
-=======
         "nodebb-plugin-markdown": "12.2.3",
->>>>>>> 66b84e0f4d (fix(deps): bump markdown)
         "nodebb-plugin-mentions": "4.3.4",
         "nodebb-plugin-ntfy": "1.5.0",
         "nodebb-plugin-spam-be-gone": "2.1.1",