added new json files
fixed merge conflicts