Update .gitconfig

Adding conflictstyle to gitconfig