another fix
Merge branch 'troops' of https://github.com/KopiSusu/Globe into troops
fixed some merge issues