fixed shard move bug

The race caused two shards to be merged into a single one for a short period of time during a shard move