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

.gitignore

@@ -150,6 +150,7 @@ out/
 secrets/
 credentials/
 .secrets
+.gitea_token.sh
 
 # ===================
 # Backup Files (organized)