configured providers to using json
fixed merge conflict