diff --git a/package.json b/package.json
index e19b3be..756fcba 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,14 @@
 {
   "name": "paarrot",
+<<<<<<< HEAD
   "version": "4.11.23",
   "description": "Paarrot - A Matrix client based on Cinny",
   "homepage": "http://synbox.ruv.wtf:8418/litruv/cinny-desktop",
+=======
+  "version": "4.11.24",
+  "description": "Yet another matrix client",
+  "homepage": "https://github.com/ajbura/cinny",
+>>>>>>> bd544193be537882c7c69a153c38cc211293c741
   "main": "electron/main.js",
   "engines": {
     "node": ">=18.0.0"