Update .gitconfig

Added accept-ours and accept-theirs