Resolved merge conflict

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cinny",
-  "version": "4.6.0",
+  "version": "4.7.1",
   "description": "Yet another matrix client",
   "main": "index.js",
   "type": "module",
@@ -57,8 +57,8 @@
     "jotai": "2.6.0",
     "linkify-react": "4.1.3",
     "linkifyjs": "4.1.3",
-    "matrix-js-sdk": "35.0.0",
     "matrix-widget-api": "1.11.0",
+    "matrix-js-sdk": "37.5.0",
     "millify": "6.1.0",
     "pdfjs-dist": "4.2.67",
     "prismjs": "1.30.0",