Cleanup .gitconfig

.gitconfig contained a git merge failure