zrender 2.0 merge