changing redis settings
merge conflict