Fix merge conflicts

Floriferous · Floriferous · commit c23f08be9f5f · 2018-02-15T16:05:45.000+01:00
diff --git a/package.json b/package.json
@@ -37,6 +37,6 @@
   },
   "dependencies": {
     "prop-types": "^15.6.0",
-    "create-react-class": "1.0.0"
+    "create-react-class": "^15.6.3"
   }
 }
