Fixed JsonUtils bug
merging
More merging