Fix incorrect merge conflict resolution

Author: camdecoster

package-lock.json

@@ -80,7 +80,7 @@
     "color-alpha": "1.0.4",
     "color-normalize": "1.5.0",
     "color-parse": "2.0.0",
-    "color-rgba": "2.1.1",
+    "color-rgba": "3.0.0",
     "d3-force": "^1.2.1",
     "d3-format": "^1.4.5",
     "d3-geo": "^1.12.1",