ensure we got the json
merge fix