edit zshrc
marge conflict