Merge conflict in gitconfig.