Modified JSON
Fixed merge conflicts