resolve merge conflicts for PR #40

- Remove merge conflict markers from blockchain RPC router
- Resolve dev_heartbeat.py conflicts (keep security vulnerability checks)
- Fix claim-task.py conflicts (unify TTL handling with timedelta)
- Preserve all production setup improvements from both branches

scripts/commit-aitbc-changes.sh

@@ -0,0 +1,51 @@
+#!/bin/bash
+
+# Quick script to commit and push aitbc-cascade changes to gitea
+
+cd /opt/aitbc
+
+echo "Committing aitbc-cascade changes..."
+
+# Add all modified files
+git add .gitignore
+git add apps/blockchain-node/src/aitbc_chain/rpc/router.py
+git add apps/coordinator-api/src/app/main.py
+git add apps/coordinator-api/src/app/services/secure_pickle.py
+git add scripts/claim-task.py
+git add systemd/aitbc-blockchain-rpc.service
+
+# Add new files
+git add SETUP_PRODUCTION.md
+git add ai-memory/
+git add apps/coordinator-api/src/app/services/translation_cache.py
+git add dev/scripts/dev_heartbeat.py
+git add scripts/init_production_genesis.py
+git add scripts/keystore.py
+git add scripts/run_production_node.py
+git add scripts/setup_production.py
+
+# Commit with descriptive message
+git commit -m "feat: add production setup and infrastructure improvements
+
+- Add production genesis initialization scripts
+- Add keystore management for production
+- Add production node runner
+- Add setup production automation
+- Add AI memory system for development tracking
+- Add translation cache service
+- Add development heartbeat monitoring
+- Update blockchain RPC router
+- Update coordinator API main configuration
+- Update secure pickle service
+- Update claim task script
+- Update blockchain service configuration
+- Update gitignore for production files"
+
+# Add gitea remote if not exists
+git remote add gitea https://gitea.bubuit.net/oib/AITBC.git 2>/dev/null || echo "Gitea remote already exists"
+
+# Push to gitea
+echo "Pushing to gitea..."
+git push gitea aitbc/36-remove-faucet-from-prod-genesis
+
+echo "Done! Changes committed and pushed to gitea."