fixed rebase error that caused redis to panic with BLPOP