fix merge wrt kCheckSum*IPv6