diff --git a/package.json b/package.json
index 81bdf49..a6b5db8 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "paarrot",
-<<<<<<< HEAD
   "version": "4.11.72",
-=======
-  "version": "4.11.83",
->>>>>>> 47f1b2c40f38dfeb985a1965fe4222614cdfcf23
   "description": "Paarrot - A Matrix client based on Cinny",
   "engines": {
     "node": ">=18.0.0"