FIx merge conflict

Author: wiziple

README.md

@@ -89,6 +89,28 @@ const IndexPage = ({ intl }) => {
 }
 export default injectIntl(IndexPage)
 ```
+Or you can use the new `useIntl` hook.
+```jsx
+import React from "react"
+import { useIntl, Link, FormattedMessage } from "gatsby-plugin-intl"
+
+const IndexPage = () => {
+  const intl = useIntl()
+  return (
+    <Layout>
+      <SEO
+        title={intl.formatMessage({ id: "title" })}
+      />
+      <Link to="/page-2/">
+        {intl.formatMessage({ id: "go_page2" })}
+        {/* OR <FormattedMessage id="go_page2" /> */}
+      </Link>
+    </Layout>
+  )
+}
+export default injectIntl(IndexPage)
+```
+
 
 ## How It Works
 

examples/gatsby-starter-default-intl/package.json

@@ -5,18 +5,18 @@
   "version": "0.2.7",
   "author": "Daewoong Moon <wiziple@gmail.com>",
   "dependencies": {
-    "gatsby": "2.13.39",
-    "gatsby-image": "^2.2.6",
+    "gatsby": "2.17.1",
+    "gatsby-image": "^2.2.29",
     "gatsby-plugin-intl": "^0.2.8",
-    "gatsby-plugin-manifest": "^2.2.4",
-    "gatsby-plugin-offline": "^2.2.4",
-    "gatsby-plugin-react-helmet": "^3.1.2",
-    "gatsby-plugin-sharp": "^2.2.9",
-    "gatsby-source-filesystem": "^2.1.6",
-    "gatsby-transformer-sharp": "^2.2.4",
+    "gatsby-plugin-manifest": "^2.2.23",
+    "gatsby-plugin-offline": "^3.0.16",
+    "gatsby-plugin-react-helmet": "^3.1.13",
+    "gatsby-plugin-sharp": "^2.2.32",
+    "gatsby-source-filesystem": "^2.1.33",
+    "gatsby-transformer-sharp": "^2.3.0",
     "prop-types": "^15.7.2",
-    "react": "^16.8.6",
-    "react-dom": "^16.8.6",
+    "react": "^16.11.0",
+    "react-dom": "^16.11.0",
     "react-helmet": "^5.2.1"
   },
   "devDependencies": {