json reader
merge conflict fixed