Fix merge conflicts hopefully

package.json

@@ -58,7 +58,6 @@
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
     "babel-runtime": "^6.26.0",
     "blurhash": "^1.0.0",
-    "chromatism": "^3.0.0",
     "classnames": "^2.2.5",
     "compression-webpack-plugin": "^3.0.0",
     "cross-env": "^6.0.0",
@@ -103,7 +102,6 @@
     "prop-types": "^15.5.10",
     "punycode": "^2.1.0",
     "qrcode.react": "^1.0.0",
-    "rails-ujs": "^5.2.3",
     "react": "^16.13.1",
     "react-color": "^2.18.1",
     "react-dom": "^16.13.1",