add new lib
delete json file
add algorithm for merge product
fix conflict
add
Merge remote-tracking branch 'origin/master'
mediamart