fix on adding troop to grid
minor
fixed merge