Fix merge error in providers.py