changed zshrc
merged conflicts