fix merge issues in ShardStatsTest