merge frontend-redis