add json string marshaller provider
merge confilict