Fix merge conflicts

Author: dstansby

src/zarr/storage/_wrapper.py

@@ -10,8 +10,6 @@
     from zarr.abc.buffer import Buffer
     from zarr.abc.store import ByteRequest
     from zarr.core.buffer import BufferPrototype
-    from zarr.core.common import BytesLike
-    from zarr.core.buffer import Buffer, BufferPrototype
 
 from zarr.abc.store import Store