update variants.yml
Fixed conflicts