Added zshrc
FIxed merge