added redis server
fixed conflicts with abhishek