Update zshrc and gitconfig settings
Fix merge conflict @ aliases