diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 31e9daf383..6d937e8434 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -38,12 +38,9 @@ importers:
       '@react-three/fiber':
         specifier: ^8.17.10
         version: 8.17.10(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(three@0.163.0)
-<<<<<<< HEAD
       '@tailwindcss/typography':
         specifier: ^0.5.15
         version: 0.5.15(tailwindcss@3.4.14(ts-node@9.1.1(typescript@5.6.3)))
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
       '@tanstack/react-query':
         specifier: ^5.48.0
         version: 5.48.0(react@18.3.1)
@@ -110,12 +107,9 @@ importers:
       react-router-dom:
         specifier: ^6.26.2
         version: 6.27.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-<<<<<<< HEAD
       remark-gfm:
         specifier: ^4.0.0
         version: 4.0.0
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
       semver:
         specifier: ^7.6.3
         version: 7.6.3
@@ -1058,14 +1052,11 @@ packages:
     peerDependencies:
       tailwindcss: '>=3.0.0 || >= 3.0.0-alpha.1 || >= 4.0.0-alpha.20'
 
-<<<<<<< HEAD
   '@tailwindcss/typography@0.5.15':
     resolution: {integrity: sha512-AqhlCXl+8grUz8uqExv5OTtgpjuVIwFTSXTrh8y9/pw6q2ek7fJ+Y8ZEVw7EB2DCcuCOtEjf9w3+J3rzts01uA==}
     peerDependencies:
       tailwindcss: '>=3.0.0 || insiders || >=4.0.0-alpha.20'
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   '@tanstack/query-core@5.48.0':
     resolution: {integrity: sha512-lZAfPPeVIqXCswE9SSbG33B6/91XOWt/Iq41bFeWb/mnHwQSIfFRbkS4bfs+WhIk9abRArF9Id2fp0Mgo+hq6Q==}
 
@@ -1190,12 +1181,9 @@ packages:
   '@types/file-saver@2.0.7':
     resolution: {integrity: sha512-dNKVfHd/jk0SkR/exKGj2ggkB45MAkzvWCaqLUUgkyjITkGNzH8H+yUwr+BLJUBjZOe9w8X3wgmXhZDRg1ED6A==}
 
-<<<<<<< HEAD
   '@types/hast@3.0.4':
     resolution: {integrity: sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==}
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   '@types/http-cache-semantics@4.0.4':
     resolution: {integrity: sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==}
 
@@ -1244,15 +1232,12 @@ packages:
   '@types/three@0.163.0':
     resolution: {integrity: sha512-uIdDhsXRpQiBUkflBS/i1l3JX14fW6Ot9csed60nfbZNXHDTRsnV2xnTVwXcgbvTiboAR4IW+t+lTL5f1rqIqA==}
 
-<<<<<<< HEAD
   '@types/unist@2.0.11':
     resolution: {integrity: sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==}
 
   '@types/unist@3.0.3':
     resolution: {integrity: sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==}
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   '@types/webxr@0.5.16':
     resolution: {integrity: sha512-0E0Cl84FECtzrB4qG19TNTqpunw0F1YF0QZZnFMF6pDw1kNKJtrlTKlVB34stGIsHbZsYQ7H0tNjPfZftkHHoA==}
 
@@ -1636,12 +1621,9 @@ packages:
   case@1.6.3:
     resolution: {integrity: sha512-mzDSXIPaFwVDvZAHqZ9VlbyF4yyXRuX6IvB06WvPYkqJVO24kX1PPhv9bfpKNFZyxYFmmgo03HUiD8iklmJYRQ==}
     engines: {node: '>= 0.8.0'}
-<<<<<<< HEAD
 
   ccount@2.0.1:
     resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
 
   chalk@2.4.2:
     resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
@@ -1832,12 +1814,9 @@ packages:
       supports-color:
         optional: true
 
-<<<<<<< HEAD
   decode-named-character-reference@1.0.2:
     resolution: {integrity: sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==}
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   decompress-response@6.0.0:
     resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==}
     engines: {node: '>=10'}
@@ -1873,13 +1852,10 @@ packages:
     resolution: {integrity: sha512-ReEBKkIfe4ya47wlPYf/gu5ib6yUG0/Aez0JQZQz94kiWtRQvZIQbTiehsnwHvLSWJnQdhVeqYue7Id1dKr0qw==}
     engines: {node: '>=10'}
 
-<<<<<<< HEAD
   dequal@2.0.3:
     resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==}
     engines: {node: '>=6'}
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   detect-gpu@5.0.38:
     resolution: {integrity: sha512-36QeGHSXYcJ/RfrnPEScR8GDprbXFG4ZhXsfVNVHztZr38+fRxgHnJl3CjYXXjbeRUhu3ZZBJh6Lg0A9v0Qd8A==}
 
@@ -1887,12 +1863,9 @@ packages:
     resolution: {integrity: sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==}
     engines: {node: '>=0.10'}
     hasBin: true
-<<<<<<< HEAD
 
   devlop@1.1.0:
     resolution: {integrity: sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==}
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
 
   didyoumean@1.2.2:
     resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==}
@@ -2427,15 +2400,12 @@ packages:
     resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
     engines: {node: '>= 0.4'}
 
-<<<<<<< HEAD
   hast-util-to-jsx-runtime@2.3.2:
     resolution: {integrity: sha512-1ngXYb+V9UT5h+PxNRa1O1FYguZK/XL+gkeqvp7EdHlB9oHUG0eYRo/vY5inBdcqo3RkPMC58/H94HvkbfGdyg==}
 
   hast-util-whitespace@3.0.0:
     resolution: {integrity: sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==}
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   highlight.js@10.7.3:
     resolution: {integrity: sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==}
 
@@ -2445,12 +2415,9 @@ packages:
   hoist-non-react-statics@3.3.2:
     resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==}
 
-<<<<<<< HEAD
   html-url-attributes@3.0.1:
     resolution: {integrity: sha512-ol6UPyBWqsrO6EJySPz2O7ZSr856WDrEzM5zMqp+FJJLGMW35cLYmmZnl0vztAZxRUoNZJFTCohfjuIJ8I4QBQ==}
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   http-cache-semantics@4.1.1:
     resolution: {integrity: sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==}
 
@@ -2522,12 +2489,9 @@ packages:
       '@types/react':
         optional: true
 
-<<<<<<< HEAD
   inline-style-parser@0.2.4:
     resolution: {integrity: sha512-0aO8FkhNZlj/ZIbNi7Lxxr12obT7cL1moPfE4tg1LkX7LlLfC6DeX4l2ZEud1ukP9jNQyNnfzQVqwbwmAATY4Q==}
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   internal-slot@1.0.7:
     resolution: {integrity: sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==}
     engines: {node: '>= 0.4'}
@@ -2628,12 +2592,9 @@ packages:
     resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
     engines: {node: '>=0.10.0'}
 
-<<<<<<< HEAD
   is-hexadecimal@2.0.1:
     resolution: {integrity: sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==}
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   is-map@2.0.3:
     resolution: {integrity: sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==}
     engines: {node: '>= 0.4'}
@@ -2930,7 +2891,6 @@ packages:
   meshoptimizer@0.18.1:
     resolution: {integrity: sha512-ZhoIoL7TNV4s5B6+rx5mC//fw8/POGyNxS/DZyCJeiZ12ScLfVwRE/GfsxwiTkMYYD5DmK2/JXnEVXqL4rF+Sw==}
 
-<<<<<<< HEAD
   micromark-core-commonmark@2.0.1:
     resolution: {integrity: sha512-CUQyKr1e///ZODyD1U3xit6zXwy1a8q2a1S1HKtIlmgvurrEpaw/Y9y6KSIbF8P59cn/NjzHyO+Q2fAyYLQrAA==}
 
@@ -3015,8 +2975,6 @@ packages:
   micromark@4.0.0:
     resolution: {integrity: sha512-o/sd0nMof8kYff+TqcDx3VSrgBTcZpSvYcAHIfHhv5VAuNmisCxjhx6YmxS8PFEpb9z5WKWKPdzf0jM23ro3RQ==}
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   micromatch@4.0.7:
     resolution: {integrity: sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==}
     engines: {node: '>=8.6'}
@@ -3248,12 +3206,9 @@ packages:
     resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
     engines: {node: '>=6'}
 
-<<<<<<< HEAD
   parse-entities@4.0.1:
     resolution: {integrity: sha512-SWzvYcSJh4d/SGLIOQfZ/CoNv6BTlI6YEQ7Nj82oDVnRpwe/Z/F1EMx42x3JAOwGBlCjeCH0BRJQbQ/opHL17w==}
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   parse5-htmlparser2-tree-adapter@6.0.1:
     resolution: {integrity: sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==}
 
@@ -3368,13 +3323,10 @@ packages:
     peerDependencies:
       postcss: ^8.2.14
 
-<<<<<<< HEAD
   postcss-selector-parser@6.0.10:
     resolution: {integrity: sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==}
     engines: {node: '>=4'}
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   postcss-selector-parser@6.1.0:
     resolution: {integrity: sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ==}
     engines: {node: '>=4'}
@@ -3415,12 +3367,9 @@ packages:
   property-expr@2.0.6:
     resolution: {integrity: sha512-SVtmxhRE/CGkn3eZY1T6pC8Nln6Fr/lu1mKSgRud0eC73whjGfoAogbn78LkD8aFL0zz3bAFerKSnOl7NlErBA==}
 
-<<<<<<< HEAD
   property-information@6.5.0:
     resolution: {integrity: sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==}
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   pump@3.0.0:
     resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==}
 
@@ -3565,7 +3514,6 @@ packages:
         optional: true
       react:
         optional: true
-<<<<<<< HEAD
 
   remark-gfm@4.0.0:
     resolution: {integrity: sha512-U92vJgBPkbw4Zfu/IiW2oTZLSL3Zpv+uI7My2eq8JxKgqraFdU8YUGicEJCEgSbeaG+QDFqIcwwfMTOEelPxuA==}
@@ -3578,8 +3526,6 @@ packages:
 
   remark-stringify@11.0.0:
     resolution: {integrity: sha512-1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw==}
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
 
   require-directory@2.1.1:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
@@ -3977,12 +3923,9 @@ packages:
   tr46@0.0.3:
     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
 
-<<<<<<< HEAD
   trim-lines@3.0.1:
     resolution: {integrity: sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==}
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   troika-three-text@0.49.1:
     resolution: {integrity: sha512-lXGWxgjJP9kw4i4Wh+0k0Q/7cRfS6iOME4knKht/KozPu9GcFA9NnNpRvehIhrUawq9B0ZRw+0oiFHgRO+4Wig==}
     peerDependencies:
@@ -4109,7 +4052,6 @@ packages:
   undici-types@5.26.5:
     resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
 
-<<<<<<< HEAD
   unified@11.0.5:
     resolution: {integrity: sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==}
 
@@ -4128,8 +4070,6 @@ packages:
   unist-util-visit@5.0.0:
     resolution: {integrity: sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==}
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   universalify@2.0.1:
     resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}
     engines: {node: '>= 10.0.0'}
@@ -4170,15 +4110,12 @@ packages:
     resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==}
     hasBin: true
 
-<<<<<<< HEAD
   vfile-message@4.0.2:
     resolution: {integrity: sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==}
 
   vfile@6.0.3:
     resolution: {integrity: sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==}
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   vite@5.4.9:
     resolution: {integrity: sha512-20OVpJHh0PAM0oSOELa5GaZNWeDjcAvQjGXy2Uyr+Tp+/D2/Hdz6NLgpJLsarPTA2QJ6v8mX2P1ZfbsSKvdMkg==}
     engines: {node: ^18.0.0 || >=20.0.0}
@@ -5192,7 +5129,6 @@ snapshots:
       mini-svg-data-uri: 1.4.4
       tailwindcss: 3.4.14(ts-node@9.1.1(typescript@5.6.3))
 
-<<<<<<< HEAD
   '@tailwindcss/typography@0.5.15(tailwindcss@3.4.14(ts-node@9.1.1(typescript@5.6.3)))':
     dependencies:
       lodash.castarray: 4.4.0
@@ -5201,8 +5137,6 @@ snapshots:
       postcss-selector-parser: 6.0.10
       tailwindcss: 3.4.14(ts-node@9.1.1(typescript@5.6.3))
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   '@tanstack/query-core@5.48.0': {}
 
   '@tanstack/react-query@5.48.0(react@18.3.1)':
@@ -5314,13 +5248,10 @@ snapshots:
 
   '@types/file-saver@2.0.7': {}
 
-<<<<<<< HEAD
   '@types/hast@3.0.4':
     dependencies:
       '@types/unist': 3.0.3
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   '@types/http-cache-semantics@4.0.4': {}
 
   '@types/json5@0.0.29': {}
@@ -5377,13 +5308,10 @@ snapshots:
       fflate: 0.8.2
       meshoptimizer: 0.18.1
 
-<<<<<<< HEAD
   '@types/unist@2.0.11': {}
 
   '@types/unist@3.0.3': {}
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   '@types/webxr@0.5.16': {}
 
   '@types/yoga-layout@1.9.2': {}
@@ -5835,11 +5763,8 @@ snapshots:
   caniuse-lite@1.0.30001669: {}
 
   case@1.6.3: {}
-<<<<<<< HEAD
 
   ccount@2.0.1: {}
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
 
   chalk@2.4.2:
     dependencies:
@@ -6014,17 +5939,12 @@ snapshots:
     dependencies:
       ms: 2.1.3
 
-<<<<<<< HEAD
   decode-named-character-reference@1.0.2:
     dependencies:
       character-entities: 2.0.2
 
   decompress-response@6.0.0:
     dependencies:
-=======
-  decompress-response@6.0.0:
-    dependencies:
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
       mimic-response: 3.1.0
 
   deep-equal@2.2.3:
@@ -6070,24 +5990,18 @@ snapshots:
 
   delay@5.0.0: {}
 
-<<<<<<< HEAD
   dequal@2.0.3: {}
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   detect-gpu@5.0.38:
     dependencies:
       webgl-constants: 1.1.1
 
   detect-libc@1.0.3: {}
 
-<<<<<<< HEAD
   devlop@1.1.0:
     dependencies:
       dequal: 2.0.3
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   didyoumean@1.2.2: {}
 
   diff@4.0.2: {}
@@ -6777,7 +6691,6 @@ snapshots:
     dependencies:
       function-bind: 1.1.2
 
-<<<<<<< HEAD
   hast-util-to-jsx-runtime@2.3.2:
     dependencies:
       '@types/estree': 1.0.6
@@ -6802,8 +6715,6 @@ snapshots:
     dependencies:
       '@types/hast': 3.0.4
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   highlight.js@10.7.3: {}
 
   hls.js@1.5.17: {}
@@ -6812,11 +6723,8 @@ snapshots:
     dependencies:
       react-is: 16.13.1
 
-<<<<<<< HEAD
   html-url-attributes@3.0.1: {}
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   http-cache-semantics@4.1.1: {}
 
   http2-client@1.3.5: {}
@@ -6893,11 +6801,8 @@ snapshots:
       - bufferutil
       - utf-8-validate
 
-<<<<<<< HEAD
   inline-style-parser@0.2.4: {}
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   internal-slot@1.0.7:
     dependencies:
       es-errors: 1.3.0
@@ -6994,11 +6899,8 @@ snapshots:
     dependencies:
       is-extglob: 2.1.1
 
-<<<<<<< HEAD
   is-hexadecimal@2.0.1: {}
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   is-map@2.0.3: {}
 
   is-negative-zero@2.0.3: {}
@@ -7383,7 +7285,6 @@ snapshots:
 
   meshoptimizer@0.18.1: {}
 
-<<<<<<< HEAD
   micromark-core-commonmark@2.0.1:
     dependencies:
       decode-named-character-reference: 1.0.2
@@ -7575,8 +7476,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   micromatch@4.0.7:
     dependencies:
       braces: 3.0.3
@@ -7807,7 +7706,6 @@ snapshots:
     dependencies:
       callsites: 3.1.0
 
-<<<<<<< HEAD
   parse-entities@4.0.1:
     dependencies:
       '@types/unist': 2.0.11
@@ -7819,8 +7717,6 @@ snapshots:
       is-decimal: 2.0.1
       is-hexadecimal: 2.0.1
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   parse5-htmlparser2-tree-adapter@6.0.1:
     dependencies:
       parse5: 6.0.1
@@ -7897,14 +7793,11 @@ snapshots:
       postcss: 8.4.38
       postcss-selector-parser: 6.1.0
 
-<<<<<<< HEAD
   postcss-selector-parser@6.0.10:
     dependencies:
       cssesc: 3.0.0
       util-deprecate: 1.0.2
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   postcss-selector-parser@6.1.0:
     dependencies:
       cssesc: 3.0.0
@@ -7948,11 +7841,8 @@ snapshots:
 
   property-expr@2.0.6: {}
 
-<<<<<<< HEAD
   property-information@6.5.0: {}
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   pump@3.0.0:
     dependencies:
       end-of-stream: 1.4.4
@@ -8111,7 +8001,6 @@ snapshots:
       '@types/react': 18.3.11
       react: 18.3.1
 
-<<<<<<< HEAD
   remark-gfm@4.0.0:
     dependencies:
       '@types/mdast': 4.0.4
@@ -8146,8 +8035,6 @@ snapshots:
       mdast-util-to-markdown: 2.1.2
       unified: 11.0.5
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   require-directory@2.1.1: {}
 
   require-from-string@2.0.2: {}
@@ -8620,11 +8507,8 @@ snapshots:
 
   tr46@0.0.3: {}
 
-<<<<<<< HEAD
   trim-lines@3.0.1: {}
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   troika-three-text@0.49.1(three@0.163.0):
     dependencies:
       bidi-js: 1.0.3
@@ -8771,7 +8655,6 @@ snapshots:
   undici-types@5.26.5:
     optional: true
 
-<<<<<<< HEAD
   unified@11.0.5:
     dependencies:
       '@types/unist': 3.0.3
@@ -8805,8 +8688,6 @@ snapshots:
       unist-util-is: 6.0.0
       unist-util-visit-parents: 6.0.1
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   universalify@2.0.1: {}
 
   update-browserslist-db@1.0.16(browserslist@4.23.1):
@@ -8839,7 +8720,6 @@ snapshots:
 
   uuid@9.0.1: {}
 
-<<<<<<< HEAD
   vfile-message@4.0.2:
     dependencies:
       '@types/unist': 3.0.3
@@ -8850,8 +8730,6 @@ snapshots:
       '@types/unist': 3.0.3
       vfile-message: 4.0.2
 
-=======
->>>>>>> 73cdc890f29ad15710b16e676013c374adba29ad
   vite@5.4.9(@types/node@20.14.2)(sass@1.80.2)(terser@5.31.1):
     dependencies:
       esbuild: 0.21.5