Fix conflict.

Author: ghengeveld

package.json

@@ -56,17 +56,11 @@
     "eslint-plugin-react": "7.12.0",
     "jest": "23.6.0",
     "jest-dom": "2.1.0",
-<<<<<<< HEAD
-    "react": "16.7.0-alpha.0",
-    "react-dom": "16.7.0-alpha.0",
-    "react-testing-library": "5.3.1",
-    "rimraf": "2.6.2"
-=======
     "prettier": "1.15.3",
     "react": "16.6.3",
     "react-dom": "16.6.3",
-    "react-testing-library": "5.2.3"
->>>>>>> master
+    "react-testing-library": "5.4.2",
+    "rimraf": "2.6.2"
   },
   "jest": {
     "coverageDirectory": "./coverage/",