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