Fixing merge conflit zshrc