cli: fix Example_zip merge skew
cli: fix Example_zip merge skew

paperstreet/cockroach,paperstreet/cockroach,paperstreet/cockroach,paperstreet/cockroach,paperstreet/cockroach,paperstreet/cockroach,paperstreet/cockroach,paperstreet/cockroach