solving merge conflict + adding d3 link