removed the merged stuff from .zshrc