resource provider updated
Fixed merge conflicts
Fixing merge conflicts