remove duplicate packages and add zsh to base
fix merge conflict