devil's advocate: the shorter the gap between your merge base and master, the less risky the merge is. the fact that it is inconsistent between shards though is a much larger problem