merge redis 3.0