resolved merge conflict for data3.js