Remove inline json encode/decode
update readme
Fix merge conflict