add itemcolors and update zshrc
fix merge conflct