moved corrected json file to the data folder
resolved merge problems