updated json format string
finish merge