Fix MerkleCollapse
begin implementing the upload diffs for client