message: Fixing a merge conflict
diff: @@ -3,13 +3,12 @@ import App, {Container} from 'next/app'
  import {Layout} from 'mdx-docs'
  import Octicon, {iconsByName} from '@githubprimer/octicons-react'
  import * as primerComponents from '../src'
  -import {Box, FlexContainer} from '../src'
  import * as docComponents from './doc-components'
  import SideNav from './doc-components/SideNav'
  import Header from './doc-components/Header'
  import customTheme from './doc-components/theme'
  -const {FlexContainer} = primerComponents
  +const {Box, FlexContainer} = primerComponents
  const iconsObject = Object.keys(iconsByName).reduce((map, key) => {
  map[iconsByName[key].name] = iconsByName[key]
  