Add json2 library
Solve conflict