created new json files
merged stuff
merged