fixed resources.json after the merge