update to new version of resources.json
merge