Family members of the late British rapper have negotiated an end to their trademark battle with the Chinese discount storefront.
