preparing harplus for json parsing
fixing merge conflicts