Merge the json branch