add json processor
merge conflict