diff --git a/containers/AvatarAdder/logic.js b/containers/AvatarAdder/logic.js
index 11ea9ebdd..ed8d3e9a1 100644
--- a/containers/AvatarAdder/logic.js
+++ b/containers/AvatarAdder/logic.js
@@ -2,7 +2,7 @@ import R from 'ramda'
 import { useEffect } from 'react'
 
 import { buildLog } from '@utils'
-import { githubApi } from '@services'
+import { githubAPI } from '@services'
 
 /* eslint-disable-next-line */
 const log = buildLog('L:AvatarAdder')
@@ -14,13 +14,13 @@ export const onSearch = e => {
     log('store.searchValue: ', store.searchValue)
     store.mark({ searching: true, searchValue: e.target.value })
 
-    githubApi
+    githubAPI
       .searchUser(store.searchValue)
       .then(res => {
-        store.mark({ githubUser: githubApi.transformUser(res) })
+        store.mark({ githubUser: githubAPI.transformUser(res) })
         store.mark({ searching: false })
       })
-      .catch(e => store.handleError(githubApi.parseError(e)))
+      .catch(e => store.handleError(githubAPI.parseError(e)))
   }
 }
 
diff --git a/containers/CheatsheetThread/logic.js b/containers/CheatsheetThread/logic.js
index 79cd83194..e3d2fcf69 100644
--- a/containers/CheatsheetThread/logic.js
+++ b/containers/CheatsheetThread/logic.js
@@ -5,7 +5,7 @@ import Prism from 'mastani-codehighlight'
 import { TYPE, EVENT, ERR, THREAD } from '@constant'
 import { asyncSuit, buildLog, errRescue, BStore, nilOrEmpty } from '@utils'
 
-import { githubApi } from '@services'
+import { githubAPI } from '@services'
 import S from './schema'
 
 /* eslint-disable-next-line */
@@ -45,7 +45,7 @@ export const syncCheetsheetFromGithub = () => {
     return store.mark({ showSyncWarning: true })
   }
 
-  githubApi
+  githubAPI
     .searchCheatsheet(store.curCommunity.raw)
     .then(res => {
       if (!res || R.startsWith('404', res))
@@ -53,7 +53,7 @@ export const syncCheetsheetFromGithub = () => {
 
       syncCheatsheet(res)
     })
-    .catch(e => store.handleError(githubApi.parseError(e)))
+    .catch(e => store.handleError(githubAPI.parseError(e)))
 }
 
 export const addContributor = user => {
diff --git a/containers/RepoEditor/logic.js b/containers/RepoEditor/logic.js
index d2d53f7ec..7ebd9ec9a 100644
--- a/containers/RepoEditor/logic.js
+++ b/containers/RepoEditor/logic.js
@@ -10,7 +10,7 @@ import {
   BStore,
   errRescue,
 } from '@utils'
-import { githubApi } from '@services'
+import { githubAPI } from '@services'
 
 import S from './schema'
 
@@ -41,16 +41,16 @@ export const onGithubSearch = () => {
   const { owner, name } = store
 
   store.mark({ searching: true })
-  githubApi
+  githubAPI
     .searchRepo(owner, name)
     .then(res => {
       store.mark({
-        editRepo: githubApi.transformRepo(res),
+        editRepo: githubAPI.transformRepo(res),
         searching: false,
         curView: 'show',
       })
     })
-    .catch(e => store.handleError(githubApi.parseError(e)))
+    .catch(e => store.handleError(githubAPI.parseError(e)))
 }
 
 /* eslint-disable-next-line */
diff --git a/containers/RepoViewer/logic.js b/containers/RepoViewer/logic.js
index 859d1c018..a0db392b7 100644
--- a/containers/RepoViewer/logic.js
+++ b/containers/RepoViewer/logic.js
@@ -3,7 +3,7 @@ import { useEffect } from 'react'
 
 import { TYPE, EVENT, ERR } from '@constant'
 import { asyncSuit, buildLog, errRescue } from '@utils'
-import { githubApi } from '@services'
+import { githubAPI } from '@services'
 
 import S from './schema'
 
@@ -62,12 +62,12 @@ const DataSolver = [
       log('should sync repo: ', store.viewingData)
       const { id, ownerName, title } = store.viewingData
 
-      githubApi
+      githubAPI
         .searchRepo(ownerName, title)
         .then(res =>
-          sr71$.mutate(S.updateRepo, { id, ...githubApi.transformRepo(res) })
+          sr71$.mutate(S.updateRepo, { id, ...githubAPI.transformRepo(res) })
         )
-        .catch(e => store.handleError(githubApi.parseError(e)))
+        .catch(e => store.handleError(githubAPI.parseError(e)))
     },
   },
 ]
diff --git a/containers/WikiThread/logic.js b/containers/WikiThread/logic.js
index 3e12336be..865cb9cfc 100644
--- a/containers/WikiThread/logic.js
+++ b/containers/WikiThread/logic.js
@@ -3,7 +3,7 @@ import { useEffect } from 'react'
 
 import { TYPE, EVENT, ERR, THREAD } from '@constant'
 import { asyncSuit, buildLog, errRescue, BStore, nilOrEmpty } from '@utils'
-import { githubApi } from '@services'
+import { githubAPI } from '@services'
 
 import S from './schema'
 
@@ -43,14 +43,14 @@ export const syncWikiFromGithub = () => {
     return store.mark({ showSyncWarning: true })
   }
 
-  githubApi
+  githubAPI
     .searchWiki(store.curCommunity.raw)
     .then(res => {
       if (!res || R.startsWith('404', res))
         return store.mark({ curView: TYPE.NOT_FOUND })
       syncWiki(res)
     })
-    .catch(e => store.handleError(githubApi.parseError(e)))
+    .catch(e => store.handleError(githubAPI.parseError(e)))
 }
 
 export const addContributor = user => {
diff --git a/package-docker.json b/package-docker.json
index 3586bb682..5783db49a 100644
--- a/package-docker.json
+++ b/package-docker.json
@@ -37,7 +37,6 @@
     "draft-js-mention-plugin": "3.1.3",
     "draft-js-plugins-editor": "2.1.1",
     "express": "^4.16.4",
-    "fetch-jsonp": "^1.1.3",
     "glob": "^7.1.2",
     "graphql": "14.3.1",
     "graphql-request": "^1.6.0",
diff --git a/package.json b/package.json
index e0a113fd7..6ae8766dc 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,6 @@
     "draft-js-mention-plugin": "3.1.3",
     "draft-js-plugins-editor": "2.1.1",
     "express": "^4.16.4",
-    "fetch-jsonp": "^1.1.3",
     "glob": "^7.1.2",
     "graphql": "14.4.0",
     "graphql-request": "^1.6.0",
diff --git a/services/github_api/client.js b/services/github_api/client.js
index 38d8dc175..9a0277e24 100644
--- a/services/github_api/client.js
+++ b/services/github_api/client.js
@@ -1,4 +1,3 @@
-import fetchJsonp from 'fetch-jsonp'
 import fetch from 'isomorphic-fetch'
 
 import { BStore, makeGithubExplore } from '@utils'
@@ -6,15 +5,29 @@ import { graphqlEndpoint } from './config'
 
 const token = BStore.get('github_token')
 
-const v3EndpointOpt = {
-  headers: { Authorization: `token ${token}` },
+const rawOptions = {
+  headers: {
+    Authorization: `token ${token}`,
+    Accept: 'application/vnd.github.VERSION.raw',
+    'Content-Type': 'application/vnd.github.VERSION.raw',
+  },
+}
+
+const jsonOptions = {
+  headers: {
+    Authorization: `token ${token}`,
+    Accept: 'application/json',
+    'Content-Type': 'application/json',
+  },
 }
 
 // graphql client
 export const graphqlClient = makeGithubExplore(graphqlEndpoint, token)
-// jsonp client
-export const restpClient = api =>
-  fetchJsonp(`${api}`, v3EndpointOpt).then(r => r.json())
-// rest client
-/* fetch(`${api}`, v3EndpointOpt).then(r => r.json()) */
-export const restClient = api => fetch(`${api}`).then(r => r.text())
+
+export const restClient = (api, fmt = 'json') => {
+  if (fmt === 'json') {
+    return fetch(`${api}`, jsonOptions).then(r => r.json())
+  }
+
+  return fetch(`${api}`, rawOptions).then(r => r.text())
+}
diff --git a/services/github_api/index.js b/services/github_api/index.js
index 1ba9ff584..48ac34dac 100644
--- a/services/github_api/index.js
+++ b/services/github_api/index.js
@@ -7,7 +7,7 @@ import { searchUserPromise, ransformUser } from './user_search'
 import { searchWikiPromise } from './wiki_search'
 import { searchCheatsheeetPromise } from './cheatsheet_search'
 
-const githubApi = {
+const githubAPI = {
   // search repo
   searchRepo: (owner, name) => searchRepoPromise(owner, name),
   transformRepo: res => transformRepo(res),
@@ -34,4 +34,4 @@ const githubApi = {
   },
 }
 
-export default githubApi
+export default githubAPI
diff --git a/services/github_api/repo_search.js b/services/github_api/repo_search.js
index 86871c491..b594c2537 100644
--- a/services/github_api/repo_search.js
+++ b/services/github_api/repo_search.js
@@ -1,27 +1,31 @@
 import R from 'ramda'
 import { timeout } from 'promise-timeout'
 
-import { ISSUE_ADDR } from '@config'
-
 import { TIMEOUT_SEC, restEndpoint } from './config'
-import { graphqlClient, restpClient } from './client'
+import { graphqlClient, restClient } from './client'
 
 import S from './schema'
 
-const baseInfoQuery = (owner, name) =>
-  graphqlClient.request(S.repository, { owner, name })
+const baseInfoQuery = (owner, name) => {
+  return graphqlClient.request(S.repository, { owner, name })
+}
 
 const contributorsQuery = (owner, name) => {
   const path = 'contributors?page=1&per_page=8'
   const api = `${restEndpoint}/repos/${owner}/${name}/${path}`
 
-  return restpClient(`${api}`)
+  return restClient(`${api}`)
+}
+
+const readmeQuery = (owner, name) => {
+  return restClient(`${restEndpoint}/repos/${owner}/${name}/readme`, 'raw')
 }
 
 export const searchRepoPromise = (owner, name) =>
   Promise.all([
     timeout(baseInfoQuery(owner, name), TIMEOUT_SEC),
     timeout(contributorsQuery(owner, name), TIMEOUT_SEC),
+    timeout(readmeQuery(owner, name), TIMEOUT_SEC),
   ])
 
 const getRelaseTag = releases => {
@@ -37,7 +41,8 @@ const getLicense = value => {
 // transform to match our model
 export const transformRepo = res => {
   const baseInfoRes = res[0].repository
-  const contributorsRes = res[1].data
+  const contributorsRes = res[1]
+  const readme = res[2]
   const contributors = []
 
   R.forEach(user => {
@@ -61,14 +66,9 @@ export const transformRepo = res => {
     licenseInfo,
     homepageUrl,
     releases,
-    object,
     primaryLanguage,
   } = baseInfoRes
 
-  const readme = object
-    ? object.text
-    : `同步错误: 目前只同步源仓库中的 README.md 文件，如果源仓库中为 README.MD / readme.md / readme.MD 等格式可能会导致该错误。 如果是其他原因，[恳请提交 issue](${ISSUE_ADDR}/new)`
-
   return {
     title: name,
     ownerName: owner.login,
diff --git a/services/github_api/schema.js b/services/github_api/schema.js
index 94a8b3704..72360a75d 100644
--- a/services/github_api/schema.js
+++ b/services/github_api/schema.js
@@ -13,6 +13,7 @@ const user = `
     }
   }
 `
+
 const repository = `
   query($owner: String!, $name: String!) {
     repository(owner: $owner, name: $name) {
@@ -22,11 +23,6 @@ const repository = `
       licenseInfo {
         key
       }
-      object(expression: "master:README.md") {
-        ... on Blob {
-          text
-        }
-      }
       forkCount
       stargazers {
         totalCount
diff --git a/services/index.js b/services/index.js
index 220e5270a..5be362606 100644
--- a/services/index.js
+++ b/services/index.js
@@ -1,2 +1,2 @@
-export { default as githubApi } from './github_api'
+export { default as githubAPI } from './github_api'
 export { default as sentry } from './sentry'
diff --git a/utils/index.js b/utils/index.js
index 026f0826c..dafc07929 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -50,7 +50,7 @@ export {
   atomizeValues,
 } from './graphql_helper'
 
-// export { default as githubApi } from './github_api'
+// export { default as githubAPI } from './github_api'
 
 export {
   parseURL,
diff --git a/yarn.lock b/yarn.lock
index db335705a..02c22c694 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -35,12 +35,7 @@
 
 "@babel/core@7.5.5", "@babel/core@^7.4.5":
   version "7.5.5"
-<<<<<<< HEAD
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.5.5.tgz#17b2686ef0d6bc58f963dddd68ab669755582c30"
-  integrity sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==
-=======
   resolved "https://registry.npmjs.org/@babel/core/-/core-7.5.5.tgz#17b2686ef0d6bc58f963dddd68ab669755582c30"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
   dependencies:
     "@babel/code-frame" "^7.5.5"
     "@babel/generator" "^7.5.5"
@@ -826,12 +821,7 @@
 
 "@commitlint/execute-rule@^8.1.0":
   version "8.1.0"
-<<<<<<< HEAD
-  resolved "https://registry.yarnpkg.com/@commitlint/execute-rule/-/execute-rule-8.1.0.tgz#e8386bd0836b3dcdd41ebb9d5904bbeb447e4715"
-  integrity sha512-+vpH3RFuO6ypuCqhP2rSqTjFTQ7ClzXtUvXphpROv9v9+7zH4L+Ex+wZLVkL8Xj2cxefSLn/5Kcqa9XyJTn3kg==
-=======
   resolved "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-8.1.0.tgz#e8386bd0836b3dcdd41ebb9d5904bbeb447e4715"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
 
 "@commitlint/format@^7.6.1":
   version "7.6.1"
@@ -858,12 +848,7 @@
 
 "@commitlint/load@>6.1.1":
   version "8.1.0"
-<<<<<<< HEAD
-  resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-8.1.0.tgz#63b72ae5bb9152b8fa5b17c5428053032a9a49c8"
-  integrity sha512-ra02Dvmd7Gp1+uFLzTY3yGOpHjPzl5T9wYg/xrtPJNiOWXvQ0Mw7THw+ucd1M5iLUWjvdavv2N87YDRc428wHg==
-=======
   resolved "https://registry.npmjs.org/@commitlint/load/-/load-8.1.0.tgz#63b72ae5bb9152b8fa5b17c5428053032a9a49c8"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
   dependencies:
     "@commitlint/execute-rule" "^8.1.0"
     "@commitlint/resolve-extends" "^8.1.0"
@@ -917,12 +902,7 @@
 
 "@commitlint/resolve-extends@^8.1.0":
   version "8.1.0"
-<<<<<<< HEAD
-  resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-8.1.0.tgz#ed67f2ee484160ac8e0078bae52f172625157472"
-  integrity sha512-r/y+CeKW72Oa9BUctS1+I/MFCDiI3lfhwfQ65Tpfn6eZ4CuBYKzrCRi++GTHeAFKE3y8q1epJq5Rl/1GBejtBw==
-=======
   resolved "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-8.1.0.tgz#ed67f2ee484160ac8e0078bae52f172625157472"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
   dependencies:
     "@types/node" "^12.0.2"
     import-fresh "^3.0.0"
@@ -1230,12 +1210,7 @@
 
 "@types/babel__core@^7.1.2":
   version "7.1.2"
-<<<<<<< HEAD
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.2.tgz#608c74f55928033fce18b99b213c16be4b3d114f"
-  integrity sha512-cfCCrFmiGY/yq0NuKNxIQvZFy9kY/1immpSpTngOnyIbD4+eJOG5mxphhHDv3CHL9GltO4GcKr54kGBg3RNdbg==
-=======
   resolved "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.2.tgz#608c74f55928033fce18b99b213c16be4b3d114f"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -1245,35 +1220,20 @@
 
 "@types/babel__generator@*":
   version "7.0.2"
-<<<<<<< HEAD
-  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.0.2.tgz#d2112a6b21fad600d7674274293c85dce0cb47fc"
-  integrity sha512-NHcOfab3Zw4q5sEE2COkpfXjoE7o+PmqD9DQW4koUT3roNxwziUdXGnRndMat/LJNUtePwn1TlP4do3uoe3KZQ==
-=======
   resolved "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.0.2.tgz#d2112a6b21fad600d7674274293c85dce0cb47fc"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@types/babel__template@*":
   version "7.0.2"
-<<<<<<< HEAD
-  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz#4ff63d6b52eddac1de7b975a5223ed32ecea9307"
-  integrity sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==
-=======
   resolved "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz#4ff63d6b52eddac1de7b975a5223ed32ecea9307"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*":
   version "7.0.7"
-<<<<<<< HEAD
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.7.tgz#2496e9ff56196cc1429c72034e07eab6121b6f3f"
-  integrity sha512-CeBpmX1J8kWLcDEnI3Cl2Eo6RfbGvzUctA+CjZUhOKDFbLfcr7fc4usEqLNWetrlJd7RhAkyYe2czXop4fICpw==
-=======
   resolved "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.7.tgz#2496e9ff56196cc1429c72034e07eab6121b6f3f"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
   dependencies:
     "@babel/types" "^7.3.0"
 
@@ -1310,14 +1270,8 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.8.tgz#551466be11b2adc3f3d47156758f610bd9f6b1d8"
 
 "@types/node@^12.0.2":
-<<<<<<< HEAD
-  version "12.6.8"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.6.8.tgz#e469b4bf9d1c9832aee4907ba8a051494357c12c"
-  integrity sha512-aX+gFgA5GHcDi89KG5keey2zf0WfZk/HAQotEamsK2kbey+8yGKcson0hbK8E+v0NArlCJQCqMP161YhV6ZXLg==
-=======
   version "12.6.9"
   resolved "https://registry.npmjs.org/@types/node/-/node-12.6.9.tgz#ffeee23afdc19ab16e979338e7b536fdebbbaeaf"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -1623,12 +1577,7 @@ ajv@^6.0.1, ajv@^6.1.0, ajv@^6.5.5, ajv@^6.9.1:
 
 ajv@^6.10.0:
   version "6.10.2"
-<<<<<<< HEAD
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
-  integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
-=======
   resolved "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"
@@ -2273,12 +2222,7 @@ babel-plugin-ramda@2.0.0:
 
 babel-plugin-react-intl@4.1.2:
   version "4.1.2"
-<<<<<<< HEAD
-  resolved "https://registry.yarnpkg.com/babel-plugin-react-intl/-/babel-plugin-react-intl-4.1.2.tgz#9092f4a61f8dccaac46bc1026f8de8c6d8dc9a87"
-  integrity sha512-5N665Yo+TIB7jv4vtLZZTMOYU2NKFO3WFW5F96dp2LBNWRWpsth3c4Extsdl6TZi+oQQnLY3Oluor4ySWlCmLA==
-=======
   resolved "https://registry.npmjs.org/babel-plugin-react-intl/-/babel-plugin-react-intl-4.1.2.tgz#9092f4a61f8dccaac46bc1026f8de8c6d8dc9a87"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
   dependencies:
     "@babel/core" "^7.4.5"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -2717,12 +2661,7 @@ cachedir@2.1.0:
 
 cachedir@2.2.0:
   version "2.2.0"
-<<<<<<< HEAD
-  resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.2.0.tgz#19afa4305e05d79e417566882e0c8f960f62ff0e"
-  integrity sha512-VvxA0xhNqIIfg0V9AmJkDg91DaJwryutH5rVEZAhcNi4iJFj9f+QxmAjgK1LT9I8OgToX27fypX6/MeCXVbBjQ==
-=======
   resolved "https://registry.npmjs.org/cachedir/-/cachedir-2.2.0.tgz#19afa4305e05d79e417566882e0c8f960f62ff0e"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
 
 call-me-maybe@^1.0.1:
   version "1.0.1"
@@ -3048,12 +2987,7 @@ commander@^2.11.0, commander@^2.18.0, commander@^2.19.0, commander@~2.20.0:
 
 commitizen@3.1.2:
   version "3.1.2"
-<<<<<<< HEAD
-  resolved "https://registry.yarnpkg.com/commitizen/-/commitizen-3.1.2.tgz#29ddd8b39396923e9058a0e4840cbeef144290be"
-  integrity sha512-eD0uTUsogu8ksFjFFYq75LLfXeLXsCIa27TPfOqvBI+tCx1Pp5QfKqC9oC+qTpSz3nTn9/+7TL5mE/wurB22JQ==
-=======
   resolved "https://registry.npmjs.org/commitizen/-/commitizen-3.1.2.tgz#29ddd8b39396923e9058a0e4840cbeef144290be"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
   dependencies:
     cachedir "2.1.0"
     cz-conventional-changelog "2.1.0"
@@ -3073,12 +3007,7 @@ commitizen@3.1.2:
 
 commitizen@^4.0.3:
   version "4.0.3"
-<<<<<<< HEAD
-  resolved "https://registry.yarnpkg.com/commitizen/-/commitizen-4.0.3.tgz#c19a4213257d0525b85139e2f36db7cc3b4f6dae"
-  integrity sha512-lxu0F/Iq4dudoFeIl5pY3h3CQJzkmQuh3ygnaOvqhAD8Wu2pYBI17ofqSuPHNsBTEOh1r1AVa9kR4Hp0FAHKcQ==
-=======
   resolved "https://registry.npmjs.org/commitizen/-/commitizen-4.0.3.tgz#c19a4213257d0525b85139e2f36db7cc3b4f6dae"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
   dependencies:
     cachedir "2.2.0"
     cz-conventional-changelog "3.0.1"
@@ -3742,12 +3671,7 @@ cz-conventional-changelog@2.1.0:
 
 cz-conventional-changelog@3.0.1:
   version "3.0.1"
-<<<<<<< HEAD
-  resolved "https://registry.yarnpkg.com/cz-conventional-changelog/-/cz-conventional-changelog-3.0.1.tgz#b1f207ae050355e7ada65aad5c52e9de3d0c8e5b"
-  integrity sha512-7KASIwB8/ClEyCRvQrCPbN7WkQnUSjSSVNyPM+gDJ0jskLi8h8N2hrdpyeCk7fIqKMRzziqVSOBTB8yyLTMHGQ==
-=======
   resolved "https://registry.npmjs.org/cz-conventional-changelog/-/cz-conventional-changelog-3.0.1.tgz#b1f207ae050355e7ada65aad5c52e9de3d0c8e5b"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
   dependencies:
     chalk "^2.4.1"
     conventional-commit-types "^2.0.0"
@@ -3760,12 +3684,7 @@ cz-conventional-changelog@3.0.1:
 
 cz-conventional-changelog@^3.0.0:
   version "3.0.2"
-<<<<<<< HEAD
-  resolved "https://registry.yarnpkg.com/cz-conventional-changelog/-/cz-conventional-changelog-3.0.2.tgz#f6b9a406177ab07f9a3a087e06103a045b376260"
-  integrity sha512-MPxERbtQyVp0nnpCBiwzKGKmMBSswmCV3Jpef3Axqd5f3c/SOc6VFiSUlclOyZXBn3Xtf4snzt4O15hBTRb2gA==
-=======
   resolved "https://registry.npmjs.org/cz-conventional-changelog/-/cz-conventional-changelog-3.0.2.tgz#f6b9a406177ab07f9a3a087e06103a045b376260"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
   dependencies:
     chalk "^2.4.1"
     commitizen "^4.0.3"
@@ -3963,12 +3882,7 @@ detect-file@^1.0.0:
 
 detect-indent@6.0.0:
   version "6.0.0"
-<<<<<<< HEAD
-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.0.0.tgz#0abd0f549f69fc6659a254fe96786186b6f528fd"
-  integrity sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==
-=======
   resolved "https://registry.npmjs.org/detect-indent/-/detect-indent-6.0.0.tgz#0abd0f549f69fc6659a254fe96786186b6f528fd"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
 
 detect-indent@^4.0.0:
   version "4.0.0"
@@ -4530,12 +4444,7 @@ eslint-scope@^4.0.0:
 
 eslint-scope@^5.0.0:
   version "5.0.0"
-<<<<<<< HEAD
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9"
-  integrity sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==
-=======
   resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
   dependencies:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
@@ -4550,12 +4459,7 @@ eslint-visitor-keys@^1.0.0:
 
 eslint@6.1.0:
   version "6.1.0"
-<<<<<<< HEAD
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.1.0.tgz#06438a4a278b1d84fb107d24eaaa35471986e646"
-  integrity sha512-QhrbdRD7ofuV09IuE2ySWBz0FyXCq0rriLTZXZqaWSI79CVtHVRdkFuFTViiqzZhkCgfOh9USpriuGN2gIpZDQ==
-=======
   resolved "https://registry.npmjs.org/eslint/-/eslint-6.1.0.tgz#06438a4a278b1d84fb107d24eaaa35471986e646"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
   dependencies:
     "@babel/code-frame" "^7.0.0"
     ajv "^6.10.0"
@@ -4597,12 +4501,7 @@ eslint@6.1.0:
 
 espree@^6.0.0:
   version "6.0.0"
-<<<<<<< HEAD
-  resolved "https://registry.yarnpkg.com/espree/-/espree-6.0.0.tgz#716fc1f5a245ef5b9a7fdb1d7b0d3f02322e75f6"
-  integrity sha512-lJvCS6YbCn3ImT3yKkPe0+tJ+mH6ljhGNjHQH9mRtiO6gjhVAOhVXW1yjnwqGwTkK3bGbye+hb00nFNmu0l/1Q==
-=======
   resolved "https://registry.npmjs.org/espree/-/espree-6.0.0.tgz#716fc1f5a245ef5b9a7fdb1d7b0d3f02322e75f6"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
   dependencies:
     acorn "^6.0.7"
     acorn-jsx "^5.0.0"
@@ -4975,10 +4874,6 @@ feature-policy@0.3.0:
   version "0.3.0"
   resolved "https://registry.npmjs.org/feature-policy/-/feature-policy-0.3.0.tgz#7430e8e54a40da01156ca30aaec1a381ce536069"
 
-fetch-jsonp@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.npmjs.org/fetch-jsonp/-/fetch-jsonp-1.1.3.tgz#9eb9e585ba08aaf700563538d17bbebbcd5a3db2"
-
 figgy-pudding@^3.5.1:
   version "3.5.1"
   resolved "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
@@ -5272,14 +5167,6 @@ fs-extra@5.0.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@8.1.0, fs-extra@^8.0.1:
-  version "8.1.0"
-  resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
 fs-extra@8.1.0, fs-extra@^8.0.1:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
@@ -5493,12 +5380,7 @@ glob-parent@^3.1.0:
 
 glob-parent@^5.0.0:
   version "5.0.0"
-<<<<<<< HEAD
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.0.0.tgz#1dc99f0f39b006d3e92c2c284068382f0c20e954"
-  integrity sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==
-=======
   resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz#1dc99f0f39b006d3e92c2c284068382f0c20e954"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
   dependencies:
     is-glob "^4.0.1"
 
@@ -5608,14 +5490,8 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3
   resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
 
 graceful-fs@^4.2.0:
-<<<<<<< HEAD
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz#8d8fdc73977cb04104721cb53666c1ca64cd328b"
-  integrity sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==
-=======
   version "4.2.1"
   resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz#1c1f0c364882c868f5bff6512146328336a11b1d"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
 
 "graceful-readlink@>= 1.0.0":
   version "1.0.1"
@@ -6119,12 +5995,7 @@ inquirer@6.2.0:
 
 inquirer@6.5.0, inquirer@^6.4.1:
   version "6.5.0"
-<<<<<<< HEAD
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.0.tgz#2303317efc9a4ea7ec2e2df6f86569b734accf42"
-  integrity sha512-scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA==
-=======
   resolved "https://registry.npmjs.org/inquirer/-/inquirer-6.5.0.tgz#2303317efc9a4ea7ec2e2df6f86569b734accf42"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
   dependencies:
     ansi-escapes "^3.2.0"
     chalk "^2.4.2"
@@ -6176,12 +6047,7 @@ intl-messageformat-parser@1.4.0:
 
 intl-messageformat-parser@^2.1.2:
   version "2.1.3"
-<<<<<<< HEAD
-  resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-2.1.3.tgz#c918e36a08bd7ff01349d8ea3736262c986aaeb1"
-  integrity sha512-YOP2GuQ8Y+f3j2Vti1/abcozYlkv/WsIffsRP8cgtN4Oha5hjhNnucxzyfmeAoDgDHw4s/lNyLylB01369a5lg==
-=======
   resolved "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-2.1.3.tgz#c918e36a08bd7ff01349d8ea3736262c986aaeb1"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
 
 intl-messageformat@^2.0.0, intl-messageformat@^2.1.0:
   version "2.2.0"
@@ -7423,12 +7289,7 @@ lodash@4.17.11, lodash@^4.15.0, lodash@^4.16.5, lodash@^4.17.10, lodash@^4.17.11
 
 lodash@4.17.14:
   version "4.17.14"
-<<<<<<< HEAD
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba"
-  integrity sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==
-=======
   resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
 
 lodash@4.17.15, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14:
   version "4.17.15"
@@ -7471,12 +7332,7 @@ longest@^1.0.1:
 
 longest@^2.0.1:
   version "2.0.1"
-<<<<<<< HEAD
-  resolved "https://registry.yarnpkg.com/longest/-/longest-2.0.1.tgz#781e183296aa94f6d4d916dc335d0d17aefa23f8"
-  integrity sha1-eB4YMpaqlPbU2RbcM10NF676I/g=
-=======
   resolved "https://registry.npmjs.org/longest/-/longest-2.0.1.tgz#781e183296aa94f6d4d916dc335d0d17aefa23f8"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
 
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
   version "1.4.0"
@@ -10426,17 +10282,13 @@ semver@6.0.0:
 
 semver@6.3.0, semver@^6.0.0, semver@^6.1.2:
   version "6.3.0"
-  resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
 semver@^6.1.1:
   version "6.2.0"
   resolved "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz#4d813d9590aaf8a9192693d6c85b9344de5901db"
 
-semver@^6.1.2:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
 send@0.16.1:
   version "0.16.1"
   resolved "https://registry.npmjs.org/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3"
@@ -11028,12 +10880,7 @@ strip-bom@3.0.0, strip-bom@^3.0.0:
 
 strip-bom@4.0.0:
   version "4.0.0"
-<<<<<<< HEAD
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
-  integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
-=======
   resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
 
 strip-bom@^2.0.0:
   version "2.0.0"
@@ -11068,12 +10915,7 @@ strip-json-comments@2.0.1, strip-json-comments@~2.0.1:
 
 strip-json-comments@3.0.1, strip-json-comments@^3.0.1:
   version "3.0.1"
-<<<<<<< HEAD
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7"
-  integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==
-=======
   resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
 
 styled-components@4.3.2:
   version "4.3.2"
@@ -11641,12 +11483,7 @@ uuid@^3.3.2:
 
 v8-compile-cache@^2.0.3:
   version "2.0.3"
-<<<<<<< HEAD
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe"
-  integrity sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==
-=======
   resolved "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe"
->>>>>>> 75bbb3688477be1e922c2ceeb394a6a20d093bef
 
 v8flags@^2.0.10:
   version "2.1.1"