diff --git a/public/assets/img/logo.svg b/public/assets/img/logo.svg
index b5f9612747..6bc8d2c89b 100644
--- a/public/assets/img/logo.svg
+++ b/public/assets/img/logo.svg
@@ -1,8 +1,3 @@
-<<<<<<< HEAD
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 640 640" width="32" height="32"><path d="m395.9 484.2-126.9-61c-12.5-6-17.9-21.2-11.8-33.8l61-126.9c6-12.5 21.2-17.9 33.8-11.8 17.2 8.3 27.1 13 27.1 13l-.1-109.2 16.7-.1.1 117.1s57.4 24.2 83.1 40.1c3.7 2.3 10.2 6.8 12.9 14.4 2.1 6.1 2 13.1-1 19.3l-61 126.9c-6.2 12.7-21.4 18.1-33.9 12" style="fill:#fff"/><path d="M622.7 149.8c-4.1-4.1-9.6-4-9.6-4s-117.2 6.6-177.9 8c-13.3.3-26.5.6-39.6.7v117.2c-5.5-2.6-11.1-5.3-16.6-7.9 0-36.4-.1-109.2-.1-109.2-29 .4-89.2-2.2-89.2-2.2s-141.4-7.1-156.8-8.5c-9.8-.6-22.5-2.1-39 1.5-8.7 1.8-33.5 7.4-53.8 26.9C-4.9 212.4 6.6 276.2 8 285.8c1.7 11.7 6.9 44.2 31.7 72.5 45.8 56.1 144.4 54.8 144.4 54.8s12.1 28.9 30.6 55.5c25 33.1 50.7 58.9 75.7 62 63 0 188.9-.1 188.9-.1s12 .1 28.3-10.3c14-8.5 26.5-23.4 26.5-23.4S547 483 565 451.5c5.5-9.7 10.1-19.1 14.1-28 0 0 55.2-117.1 55.2-231.1-1.1-34.5-9.6-40.6-11.6-42.6M125.6 353.9c-25.9-8.5-36.9-18.7-36.9-18.7S69.6 321.8 60 295.4c-16.5-44.2-1.4-71.2-1.4-71.2s8.4-22.5 38.5-30c13.8-3.7 31-3.1 31-3.1s7.1 59.4 15.7 94.2c7.2 29.2 24.8 77.7 24.8 77.7s-26.1-3.1-43-9.1m300.3 107.6s-6.1 14.5-19.6 15.4c-5.8.4-10.3-1.2-10.3-1.2s-.3-.1-5.3-2.1l-112.9-55s-10.9-5.7-12.8-15.6c-2.2-8.1 2.7-18.1 2.7-18.1L322 273s4.8-9.7 12.2-13c.6-.3 2.3-1 4.5-1.5 8.1-2.1 18 2.8 18 2.8L467.4 315s12.6 5.7 15.3 16.2c1.9 7.4-.5 14-1.8 17.2-6.3 15.4-55 113.1-55 113.1" style="fill:#609926"/><path d="M326.8 380.1c-8.2.1-15.4 5.8-17.3 13.8s2 16.3 9.1 20c7.7 4 17.5 1.8 22.7-5.4 5.1-7.1 4.3-16.9-1.8-23.1l24-49.1c1.5.1 3.7.2 6.2-.5 4.1-.9 7.1-3.6 7.1-3.6 4.2 1.8 8.6 3.8 13.2 6.1 4.8 2.4 9.3 4.9 13.4 7.3.9.5 1.8 1.1 2.8 1.9 1.6 1.3 3.4 3.1 4.7 5.5 1.9 5.5-1.9 14.9-1.9 14.9-2.3 7.6-18.4 40.6-18.4 40.6-8.1-.2-15.3 5-17.7 12.5-2.6 8.1 1.1 17.3 8.9 21.3s17.4 1.7 22.5-5.3c5-6.8 4.6-16.3-1.1-22.6 1.9-3.7 3.7-7.4 5.6-11.3 5-10.4 13.5-30.4 13.5-30.4.9-1.7 5.7-10.3 2.7-21.3-2.5-11.4-12.6-16.7-12.6-16.7-12.2-7.9-29.2-15.2-29.2-15.2s0-4.1-1.1-7.1c-1.1-3.1-2.8-5.1-3.9-6.3 4.7-9.7 9.4-19.3 14.1-29-4.1-2-8.1-4-12.2-6.1-4.8 9.8-9.7 19.7-14.5 29.5-6.7-.1-12.9 3.5-16.1 9.4-3.4 6.3-2.7 14.1 1.9 19.8z" style="fill:#609926"/></svg>
-||||||| 707c69f399
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640" style="enable-background:new 0 0 640 640" xml:space="preserve" width="32" height="32"><path style="fill:#fff" d="m395.9 484.2-126.9-61c-12.5-6-17.9-21.2-11.8-33.8l61-126.9c6-12.5 21.2-17.9 33.8-11.8 17.2 8.3 27.1 13 27.1 13l-.1-109.2 16.7-.1.1 117.1s57.4 24.2 83.1 40.1c3.7 2.3 10.2 6.8 12.9 14.4 2.1 6.1 2 13.1-1 19.3l-61 126.9c-6.2 12.7-21.4 18.1-33.9 12z"/><path style="fill:#609926" d="M622.7 149.8c-4.1-4.1-9.6-4-9.6-4s-117.2 6.6-177.9 8c-13.3.3-26.5.6-39.6.7v117.2c-5.5-2.6-11.1-5.3-16.6-7.9 0-36.4-.1-109.2-.1-109.2-29 .4-89.2-2.2-89.2-2.2s-141.4-7.1-156.8-8.5c-9.8-.6-22.5-2.1-39 1.5-8.7 1.8-33.5 7.4-53.8 26.9C-4.9 212.4 6.6 276.2 8 285.8c1.7 11.7 6.9 44.2 31.7 72.5 45.8 56.1 144.4 54.8 144.4 54.8s12.1 28.9 30.6 55.5c25 33.1 50.7 58.9 75.7 62 63 0 188.9-.1 188.9-.1s12 .1 28.3-10.3c14-8.5 26.5-23.4 26.5-23.4S547 483 565 451.5c5.5-9.7 10.1-19.1 14.1-28 0 0 55.2-117.1 55.2-231.1-1.1-34.5-9.6-40.6-11.6-42.6zM125.6 353.9c-25.9-8.5-36.9-18.7-36.9-18.7S69.6 321.8 60 295.4c-16.5-44.2-1.4-71.2-1.4-71.2s8.4-22.5 38.5-30c13.8-3.7 31-3.1 31-3.1s7.1 59.4 15.7 94.2c7.2 29.2 24.8 77.7 24.8 77.7s-26.1-3.1-43-9.1zm300.3 107.6s-6.1 14.5-19.6 15.4c-5.8.4-10.3-1.2-10.3-1.2s-.3-.1-5.3-2.1l-112.9-55s-10.9-5.7-12.8-15.6c-2.2-8.1 2.7-18.1 2.7-18.1L322 273s4.8-9.7 12.2-13c.6-.3 2.3-1 4.5-1.5 8.1-2.1 18 2.8 18 2.8L467.4 315s12.6 5.7 15.3 16.2c1.9 7.4-.5 14-1.8 17.2-6.3 15.4-55 113.1-55 113.1z"/><path style="fill:#609926" d="M326.8 380.1c-8.2.1-15.4 5.8-17.3 13.8-1.9 8 2 16.3 9.1 20 7.7 4 17.5 1.8 22.7-5.4 5.1-7.1 4.3-16.9-1.8-23.1l24-49.1c1.5.1 3.7.2 6.2-.5 4.1-.9 7.1-3.6 7.1-3.6 4.2 1.8 8.6 3.8 13.2 6.1 4.8 2.4 9.3 4.9 13.4 7.3.9.5 1.8 1.1 2.8 1.9 1.6 1.3 3.4 3.1 4.7 5.5 1.9 5.5-1.9 14.9-1.9 14.9-2.3 7.6-18.4 40.6-18.4 40.6-8.1-.2-15.3 5-17.7 12.5-2.6 8.1 1.1 17.3 8.9 21.3 7.8 4 17.4 1.7 22.5-5.3 5-6.8 4.6-16.3-1.1-22.6 1.9-3.7 3.7-7.4 5.6-11.3 5-10.4 13.5-30.4 13.5-30.4.9-1.7 5.7-10.3 2.7-21.3-2.5-11.4-12.6-16.7-12.6-16.7-12.2-7.9-29.2-15.2-29.2-15.2s0-4.1-1.1-7.1c-1.1-3.1-2.8-5.1-3.9-6.3 4.7-9.7 9.4-19.3 14.1-29-4.1-2-8.1-4-12.2-6.1-4.8 9.8-9.7 19.7-14.5 29.5-6.7-.1-12.9 3.5-16.1 9.4-3.4 6.3-2.7 14.1 1.9 19.8l-24.6 50.4z"/></svg>
-=======
 <svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M256 500C390.757 500 500 390.757 500 256C500 121.243 390.757 12 256 12C121.243 12 12 121.243 12 256C12 390.757 121.243 500 256 500Z" fill="#AAC906" stroke="#1E1E1E" stroke-width="24" stroke-miterlimit="10" stroke-linejoin="bevel"/>
 <rect x="73" y="145" width="366" height="221.662" rx="110.831" fill="#1E1E1E"/>
@@ -10,4 +5,3 @@
 <path d="M263.734 297.029C257.821 297.029 252.299 296.103 247.17 294.25C242.112 292.327 237.659 289.655 233.812 286.236C230.037 282.816 227.116 278.756 225.05 274.054C222.984 269.281 221.951 264.009 221.951 258.238C221.951 252.61 223.019 247.445 225.157 242.743C227.365 238.041 230.357 233.981 234.133 230.561C237.909 227.142 242.361 224.47 247.491 222.546C252.62 220.623 258.141 219.661 264.054 219.661C268.115 219.661 272.033 220.16 275.809 221.157C279.656 222.155 283.218 223.544 286.495 225.325C289.772 227.106 292.55 229.136 294.83 231.416L284.037 244.881C282.327 243.242 280.475 241.817 278.48 240.606C276.486 239.324 274.242 238.326 271.748 237.614C269.255 236.83 266.512 236.438 263.52 236.438C260.599 236.438 257.749 236.937 254.971 237.935C252.193 238.932 249.735 240.392 247.597 242.316C245.46 244.168 243.75 246.483 242.468 249.262C241.257 251.969 240.652 255.032 240.652 258.452C240.652 261.871 241.293 264.935 242.575 267.642C243.857 270.349 245.603 272.664 247.811 274.588C250.091 276.44 252.727 277.865 255.719 278.862C258.711 279.86 261.953 280.358 265.443 280.358C268.507 280.358 271.285 279.931 273.779 279.076C276.272 278.221 278.516 277.188 280.511 275.977C282.506 274.695 284.287 273.341 285.854 271.916L294.51 285.915C292.586 287.768 290.021 289.549 286.816 291.258C283.61 292.968 280.012 294.357 276.023 295.426C272.033 296.495 267.937 297.029 263.734 297.029Z" fill="white"/>
 <path d="M336.018 297.029C330.603 297.029 325.688 296.459 321.271 295.319C316.925 294.179 313.007 292.576 309.516 290.51C306.097 288.373 302.962 285.88 300.112 283.03L310.05 269.779C314.539 274.267 319.027 277.402 323.515 279.183C328.074 280.893 332.598 281.748 337.086 281.748C339.152 281.748 341.147 281.534 343.071 281.106C345.065 280.608 346.668 279.824 347.879 278.756C349.09 277.687 349.696 276.298 349.696 274.588C349.696 273.448 349.375 272.486 348.734 271.703C348.093 270.848 347.203 270.135 346.063 269.565C344.923 268.996 343.569 268.497 342.002 268.069C340.506 267.642 338.903 267.286 337.193 267.001C335.555 266.645 333.809 266.324 331.957 266.039C327.469 265.327 323.479 264.329 319.989 263.047C316.569 261.765 313.684 260.162 311.333 258.238C308.982 256.315 307.165 254.071 305.883 251.506C304.672 248.941 304.066 246.02 304.066 242.743C304.066 239.252 304.885 236.082 306.524 233.233C308.234 230.312 310.549 227.854 313.47 225.859C316.391 223.793 319.775 222.226 323.622 221.157C327.469 220.017 331.53 219.448 335.804 219.448C340.933 219.448 345.386 219.946 349.162 220.944C353.009 221.941 356.357 223.366 359.207 225.218C362.056 226.999 364.443 229.101 366.366 231.523L356.215 243.064C354.433 241.283 352.439 239.787 350.23 238.576C348.022 237.365 345.671 236.438 343.177 235.797C340.755 235.156 338.297 234.836 335.804 234.836C333.311 234.836 331.102 235.121 329.179 235.69C327.255 236.189 325.723 236.937 324.584 237.935C323.444 238.932 322.874 240.179 322.874 241.675C322.874 242.957 323.337 244.061 324.263 244.987C325.189 245.842 326.4 246.59 327.896 247.231C329.464 247.873 331.209 248.407 333.132 248.834C335.056 249.191 336.979 249.511 338.903 249.796C342.964 250.437 346.775 251.292 350.337 252.361C353.899 253.358 357.034 254.712 359.741 256.422C362.448 258.06 364.55 260.197 366.046 262.833C367.613 265.398 368.397 268.604 368.397 272.451C368.397 277.651 366.972 282.104 364.122 285.808C361.344 289.442 357.532 292.22 352.688 294.144C347.844 296.067 342.287 297.029 336.018 297.029Z" fill="white"/>
 </svg>
->>>>>>> root-v1.21-and-main