json handler api
resolved conflicts