Manually merge in the last changes from work zshrc