added json file to master
resolved merge conflict