diff --git a/.npmrc b/.npmrc
index 73e95ff..7bf1a28 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1 +1,5 @@
+<<<<<<< HEAD
+
+=======
+>>>>>>> 296b89382b4119a407935f390a024f712b8bfc9f
 scope=friendsofreactjs
diff --git a/package.json b/package.json
index 5cb42c7..ba8b852 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,8 @@
   ],
   "dependencies": {
     "hoist-non-react-statics": "^3.0.1",
-    "invariant": "^2.2.4"
+    "invariant": "^2.2.4",
+    "prop-types": "^15.6.2"
   },
   "devDependencies": {
     "@types/react": "^16.4.7",
@@ -44,7 +45,6 @@
     "jest": "^23.4.2",
     "jsdom": "^12.0.0",
     "prettier": "^1.14.0",
-    "prop-types": "^15.6.2",
     "react": "^16.4.2",
     "react-dom": "^16.4.2",
     "rimraf": "^2.6.2",