Resolved yarn conflicts and merge with main

package.json

@@ -34,9 +34,9 @@
     "@mui/lab": "^5.0.0-alpha.72",
     "@mui/material": "^5.5.0",
     "@pushprotocol/ledgerlive": "latest",
-    "@pushprotocol/restapi": "1.4.21",
+    "@pushprotocol/restapi": "0.0.1-alpha.49",
     "@pushprotocol/socket": "latest",
-    "@pushprotocol/uiweb": "1.1.14",
+    "@pushprotocol/uiweb": "0.0.1-alpha.20",
     "@reduxjs/toolkit": "^1.7.1",
     "@testing-library/dom": "^9.0.1",
     "@testing-library/jest-dom": "^4.2.4",
@@ -101,9 +101,10 @@
     "react-dropzone-uploader": "2.11.0",
     "react-easy-crop": "^4.1.4",
     "react-ga": "2.7.0",
-    "react-icons": "^4.7.1",
+    "react-icons": "^4.11.0",
     "react-image-file-resizer": "^0.4.7",
     "react-images-upload": "^1.2.8",
+    "react-input-slider": "^6.0.1",
     "react-joyride": "^2.4.0",
     "react-loader-spinner": "^5.3.4",
     "react-multi-select-component": "^4.2.3",