Redis fuck yeah
Fixed merge