fix merge conflicts

Author: jnsdls

.changeset/fine-bobcats-rhyme.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Update implementations

.changeset/hot-pets-tie.md

@@ -0,0 +1,5 @@
+---
+"@thirdweb-dev/nexus": minor
+---
+
+initial release

.changeset/neat-squids-go.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+expose some useful erc20 extensions

.changeset/weak-guests-fry.md

@@ -188,9 +188,16 @@ jobs:
       - name: Build Packages
         run: pnpm build
 
-      - name: Report bundle size
+      - name: Report bundle size (thirdweb)
         uses: andresz1/size-limit-action@94bc357df29c36c8f8d50ea497c3e225c3c95d1d # v1.8.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           package_manager: pnpm
-          directory: packages/thirdweb
+          directory: packages/thirdweb
+
+      - name: Report bundle size (nexus)
+        uses: andresz1/size-limit-action@94bc357df29c36c8f8d50ea497c3e225c3c95d1d # v1.8.0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          package_manager: pnpm
+          directory: packages/nexus

.changeset/wise-actors-attack.md

@@ -95,7 +95,7 @@ function SkeletonBarChart(props: {
             fill={`url(#${fillAreaSkeletonId})`}
             radius={8}
             stroke="hsl(var(--muted-foreground))"
-            type="natural"
+            type="monotone"
           />
         </AreaChart>
       )}

.changeset/witty-spies-know.md

@@ -172,7 +172,7 @@ export function ThirdwebAreaChart<TConfig extends ChartConfig>(
                     key={key}
                     stackId={props.variant !== "stacked" ? undefined : "a"}
                     stroke={`var(--color-${key})`}
-                    type="natural"
+                    type="monotone"
                   />
                 ),
               )}