Fix problem in merge, update d3.js to latest version