resolve merge conflict

ryanwaits · ryanwaits · commit 7b9ab0dc6cad · 2025-03-26T11:49:00.000-05:00
diff --git a/app/layout.tsx b/app/layout.tsx
@@ -40,14 +40,14 @@ export default function RootLayout({
       <body className="flex min-h-screen flex-col">
         <Provider>
           <Banner
-            id="api-tiers"
-            cta="Meet Hiro’s new account tiers"
-            url="https://hiro.so/pricing"
-            startDate="2025-03-19"
-            endDate="2025-04-04"
-            mobileText="Increase your API rate limits"
+            id="hacks"
+            cta="Start hacking"
+            url="/stacks/hacks/build-with-sbtc"
+            startDate="2025-03-26"
+            endDate="2025-04-01"
+            mobileText="Compete for a scholarship to Bitcoin 2025 in Las Vegas."
           >
-            Increased API rate limits, dedicated support channels.
+            Compete for a scholarship to Bitcoin 2025
           </Banner>
           {children}
           <Footer />
diff --git a/content/docs/stacks/hacks/archive/recipes.mdx b/content/docs/stacks/hacks/archive/recipes.mdx
diff --git a/content/docs/stacks/hacks/build-with-sbtc.mdx b/content/docs/stacks/hacks/build-with-sbtc.mdx
@@ -0,0 +1,32 @@
+---
+title: Create an app that interacts with sBTC
+description: Build an app or feature that interacts with sBTC. Compete for your scholarship.
+---
+
+## March: Create an app that interacts with sBTC
+
+*Build an app or feature that interacts with sBTC. Compete for your scholarship.*
+
+**Timeline**: March 26 - April 1, 2025
+
+This month's challenge is to build with [sBTC](https://www.stacks.co/sbtc), the new programmable Bitcoin-backed asset on Stacks. Since its launch in December, sBTC has brought $260M of BTC liquidity directly to Stacks. With sBTC withdrawals going live on March 31st, there's never been a better time to start building with sBTC, and this is your perfect opportunity to get started.
+
+We will be awarding 2 developer scholarships to 2 different winners this month. Each scholarship will receive **hotel accommodations**, a **$1,000 travel stipend**, and tickets to **Bitcoin 2025** in Las Vegas.
+
+Submit your project [here](https://hirohacks25.paperform.co/).
+
+Your submission can be a full-fledged application, or a new feature in your existing project. The one requirement is it has to interact with sBTC in some way.
+
+## Some example recipe ideas to explore
+
+- A cli command for transferring sBTC
+- An analytics dashboard for sBTC activity
+- Any kind of smart contract functionality that interacts with sBTC
+---
+
+## Resources
+
+- [Working with sBTC in Clarinet](/stacks/clarinet/guides/working-with-sbtc)
+- [sBTC package](/stacks/stacks.js/packages/sbtc)
+- [Submission form](https://hirohacks25.paperform.co/)
+- [Stacks Discord](https://stacks.chat)
diff --git a/content/docs/stacks/hacks/index.mdx b/content/docs/stacks/hacks/index.mdx
@@ -18,17 +18,17 @@ To submit your projects each month, [complete this form](https://hirohacks25.pap
 | --- | --- | --- |
 | Jan 22-28 | [AI x Stacks](/stacks/hacks/archive/ai) | Build something that combines AI capabilities with Stacks. |
 | Feb 19-25 | [Create your own recipe](/stacks/hacks/recipes) | Create your own recipe for the Hiro Cookbook and share it with the community. |
-| Mar 19-25 | TBA | Coming soon |
+| Mar 26 - Apr 1 | [Build with sBTC](/stacks/hacks/build-with-sbtc) | Build an app or feature that interacts with sBTC. |
 | Apr 23-29 | TBA | Coming soon |
 | May 21-27 | TBA | Coming soon |
 | Jun 18-24 | TBA | Coming soon |
 | ??? | ??? | ??? |
 
 ## Prizes
 
-At the end of each monthly hack, Hiro will host a livestream on X going over submissions and announcing that month's winning developer. The prize? Fame, glory and Hiro swag.
+For March's hack, we will be awarding 2 developer scholarships to 2 different winners. Each developer scholarship includes **hotel accommodations**, a **$1,000 travel stipend**, and **tickets to Bitcoin 2025** in Las Vegas.
 
-Top developers from these monthly hacks will be invited to participate in a Hiro hacker house tied to one of the year's biggest conferences, key expenses covered. We'll share more details on that house soon, so stay tuned.
+Code your way to Vegas and spend time with Stacks builders while diving into the zany world of the biggest Bitcoin conference of the year.
 
 ## Resources
 
diff --git a/content/docs/stacks/hacks/meta.json b/content/docs/stacks/hacks/meta.json
@@ -5,8 +5,9 @@
     "---Hiro Hacks---",
     "index",
     "---Hacks---",
-    "recipes",
+    "build-with-sbtc",
     "---Archive---",
+    "archive/recipes",
     "archive/ai",
     "archive/build-a-friend-tech-clone",
     "archive/build-a-decentralized-grants-program",
