trade fix
Merge branch 'trades-and-alliances' of https://github.com/amni/RISC into trades-and-alliances