Resolve merge conflict
Resolve merge conflict

phlip9/ioredis,paskakaska/ioredis,nswbmw/ioredis,xuyanxiang/ioredis,suprememoocow/ioredis,pensierinmusica/ioredis,luin/ioredis,thorsteinsson/ioredis,DynamicYield/ioredis,fracmak/ioredis,mtlima/ioredis,AVVS/ioredis,DynamicYield/ioredis,luin/ioredis,luin/ioredis,alsotang/ioredis,AlphaStaxLLC/ioredis,ColmHally/ioredis,albin3/ioredis