Remove merge conflict in zshrc