tmp
merge
content/type json bug fix