resolve conflict with Redis