fix merge conflicts#1348

Merged

sam0x17 merged 2 commits intodevnet-readyfrom sam-fix-devnet-ready

Feb 27, 2025

Commits on Feb 24, 2025

mainnet deploy 2/24/2025 (#1340 )

authored

Commits on Feb 27, 2025

Merge remote-tracking branch 'origin/main' into devnet-ready
sam0x17
committed