Clean up gitconfig, use diff3 for merge conflicts