add testjson
merge