resolve conflict

Author: ltmylinh

package.json

@@ -46,15 +46,9 @@
     "mdast-util-to-string": "^1.0.5",
     "normalize.css": "^8.0.0",
     "prettier": "^1.7.4",
-<<<<<<< HEAD
-    "prismjs": "^1.23.0",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
-=======
     "prismjs": "^1.15.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
->>>>>>> 968f09159512b59afd5246a928789ae52592c923
     "react-helmet": "^5.2.0",
     "react-live": "1.8.0-0",
     "remarkable": "^1.7.1",