Fix conflicts for package.json

package.json

@@ -35,19 +35,11 @@
     "d3-array": "^1.2.1",
     "d3-axis": "^1.0.8",
     "d3-brush": "^1.0.4",
-<<<<<<< HEAD
-    "d3-ease": "^1.0.3",
-=======
->>>>>>> upstream/master
     "d3-scale": "^1.0.7",
     "d3-selection": "^1.2.0",
     "d3-shape": "^1.2.0",
     "d3-time": "^1.0.8",
     "d3-time-format": "^2.1.1",
-<<<<<<< HEAD
-    "d3-transition": "^1.1.1",
-=======
->>>>>>> upstream/master
     "deckar01-task_list": "^2.0.0",
     "diff": "^3.4.0",
     "document-register-element": "1.3.0",