Rename JSON file
Merge changes