JRGTH 5580c9d0d3 Solver more conflicts due later updates ...

Updated this PR and added the later changes to solve some conflicts to the `bastille` bin cmd, this is now ready for review.

Between I would double quote the bastille version to:
```
BASTILLE_VERSION="1.0.20250714"
```
But I leave that as that just in case.

2025-07-09 00:25:36 -04:00

..

local

Solver more conflicts due later updates

2025-07-09 00:25:36 -04:00