JSON data retrieval added
more conflicts