update
fix merge
change getJSON url