diff --git a/install/package.json b/install/package.json
index 7514333162..3465b30c08 100644
--- a/install/package.json
+++ b/install/package.json
@@ -69,11 +69,7 @@
       "nodebb-plugin-spam-be-gone": "0.5.1",
       "nodebb-rewards-essentials": "0.0.9",
       "nodebb-theme-lavender": "5.0.0",
-<<<<<<< Updated upstream
-      "nodebb-theme-persona": "7.1.5",
-=======
       "nodebb-theme-persona": "7.1.6",
->>>>>>> Stashed changes
       "nodebb-theme-slick": "1.1.2",
       "nodebb-theme-vanilla": "8.1.1",
       "nodebb-widget-essentials": "4.0.1",