update the API wording to target the root

docs/pages/api/container.md

@@ -31,34 +31,20 @@ Any other properties supplied will be provided to the root element (native eleme
 
 ## CSS
 
-<<<<<<< HEAD:docs/pages/api/container.md
 You can override all the class names injected by Material-UI thanks to the `classes` prop.
 This prop accepts the following keys:
-=======
-You can override all the class names injected by Material-UI thanks to the `classes` property.
-This property accepts the following keys:
->>>>>>> Add disableGutters prop to Container component:pages/api/container.md
 
 
 | Name | Description |
 |:-----|:------------|
 | <span class="prop-name">root</span> | Styles applied to the root element.
-<<<<<<< HEAD:docs/pages/api/container.md
+| <span class="prop-name">gutters</span> | Styles applied to the root element if `disableGutters={false}`.
 | <span class="prop-name">fixed</span> | Styles applied to the root element if `fixed={true}`.
 | <span class="prop-name">maxWidthXs</span> | Styles applied to the root element if `maxWidth="xs"`.
 | <span class="prop-name">maxWidthSm</span> | Styles applied to the root element if `maxWidth="sm"`.
 | <span class="prop-name">maxWidthMd</span> | Styles applied to the root element if `maxWidth="md"`.
 | <span class="prop-name">maxWidthLg</span> | Styles applied to the root element if `maxWidth="lg"`.
 | <span class="prop-name">maxWidthXl</span> | Styles applied to the root element if `maxWidth="xl"`.
-=======
-| <span class="prop-name">gutters</span> | Styles applied to the inner `component` element if `disableGutters={false}`.
-| <span class="prop-name">fixed</span> | Styles applied to the inner `component` element if `fixed={true}`.
-| <span class="prop-name">maxWidthXs</span> | Styles applied to the inner `component` element if `maxWidth="xs"`.
-| <span class="prop-name">maxWidthSm</span> | Styles applied to the inner `component` element if `maxWidth="sm"`.
-| <span class="prop-name">maxWidthMd</span> | Styles applied to the inner `component` element if `maxWidth="md"`.
-| <span class="prop-name">maxWidthLg</span> | Styles applied to the inner `component` element if `maxWidth="lg"`.
-| <span class="prop-name">maxWidthXl</span> | Styles applied to the inner `component` element if `maxWidth="xl"`.
->>>>>>> Add disableGutters prop to Container component:pages/api/container.md
 
 Have a look at the [overriding styles with classes](/customization/components/#overriding-styles-with-classes) section
 and the [implementation of the component](https://github.com/mui-org/material-ui/blob/master/packages/material-ui/src/Container/Container.js)

packages/material-ui/src/Container/Container.js

@@ -12,7 +12,7 @@ export const styles = theme => ({
     boxSizing: 'border-box',
     marginRight: 'auto',
   },
-  /* Styles applied to the inner `component` element if `disableGutters={false}`. */
+  /* Styles applied to the root element if `disableGutters={false}`. */
   gutters: {
     paddingLeft: theme.spacing(2),
     paddingRight: theme.spacing(2),