fix merge conflict

README.md

@@ -176,56 +176,6 @@ Enable the rules that you would like to use.
 |  |  | [react/style-prop-object](docs/rules/style-prop-object.md) | Enforce style prop value is an object |
 |  |  | [react/void-dom-elements-no-children](docs/rules/void-dom-elements-no-children.md) | Prevent passing of children to void DOM elements (e.g. `<br />`). |
 <!-- AUTO-GENERATED-CONTENT:END -->
-* [react/boolean-prop-naming](docs/rules/boolean-prop-naming.md): Enforces consistent naming for boolean props
-* [react/button-has-type](docs/rules/button-has-type.md): Forbid "button" element without an explicit "type" attribute
-* [react/default-props-match-prop-types](docs/rules/default-props-match-prop-types.md): Prevent extraneous defaultProps on components
-* [react/destructuring-assignment](docs/rules/destructuring-assignment.md): Rule enforces consistent usage of destructuring assignment in component
-* [react/display-name](docs/rules/display-name.md): Prevent missing `displayName` in a React component definition
-* [react/forbid-component-props](docs/rules/forbid-component-props.md): Forbid certain props on Components
-* [react/forbid-dom-props](docs/rules/forbid-dom-props.md): Forbid certain props on DOM Nodes
-* [react/forbid-elements](docs/rules/forbid-elements.md): Forbid certain elements
-* [react/forbid-prop-types](docs/rules/forbid-prop-types.md): Forbid certain propTypes
-* [react/forbid-foreign-prop-types](docs/rules/forbid-foreign-prop-types.md): Forbid foreign propTypes
-* [react/no-access-state-in-setstate](docs/rules/no-access-state-in-setstate.md): Prevent using this.state inside this.setState
-* [react/no-array-index-key](docs/rules/no-array-index-key.md): Prevent using Array index in `key` props
-* [react/no-arrow-function-lifecycle](docs/rules/no-arrow-function-lifecycle.md): Don't use arrow function for lifecycle methods
-* [react/no-children-prop](docs/rules/no-children-prop.md): Prevent passing children as props
-* [react/no-danger](docs/rules/no-danger.md): Prevent usage of dangerous JSX properties
-* [react/no-danger-with-children](docs/rules/no-danger-with-children.md): Prevent problem with children and props.dangerouslySetInnerHTML
-* [react/no-deprecated](docs/rules/no-deprecated.md): Prevent usage of deprecated methods, including component lifecycle methods
-* [react/no-did-mount-set-state](docs/rules/no-did-mount-set-state.md): Prevent usage of `setState` in `componentDidMount`
-* [react/no-did-update-set-state](docs/rules/no-did-update-set-state.md): Prevent usage of `setState` in `componentDidUpdate`
-* [react/no-direct-mutation-state](docs/rules/no-direct-mutation-state.md): Prevent direct mutation of `this.state`
-* [react/no-find-dom-node](docs/rules/no-find-dom-node.md): Prevent usage of `findDOMNode`
-* [react/no-is-mounted](docs/rules/no-is-mounted.md): Prevent usage of `isMounted`
-* [react/no-multi-comp](docs/rules/no-multi-comp.md): Prevent multiple component definition per file
-* [react/no-redundant-should-component-update](docs/rules/no-redundant-should-component-update.md): Prevent usage of `shouldComponentUpdate` when extending React.PureComponent
-* [react/no-render-return-value](docs/rules/no-render-return-value.md): Prevent usage of the return value of `React.render`
-* [react/no-set-state](docs/rules/no-set-state.md): Prevent usage of `setState`
-* [react/no-typos](docs/rules/no-typos.md): Prevent common casing typos
-* [react/no-string-refs](docs/rules/no-string-refs.md): Prevent using string references in `ref` attribute.
-* [react/no-this-in-sfc](docs/rules/no-this-in-sfc.md): Prevent using `this` in stateless functional components
-* [react/no-unescaped-entities](docs/rules/no-unescaped-entities.md): Prevent invalid characters from appearing in markup
-* [react/no-unknown-property](docs/rules/no-unknown-property.md): Prevent usage of unknown DOM property (fixable)
-* [react/no-unsafe](docs/rules/no-unsafe.md): Prevent usage of unsafe lifecycle methods
-* [react/no-unused-prop-types](docs/rules/no-unused-prop-types.md): Prevent definitions of unused prop types
-* [react/no-unused-state](docs/rules/no-unused-state.md): Prevent definitions of unused state properties
-* [react/no-will-update-set-state](docs/rules/no-will-update-set-state.md): Prevent usage of `setState` in `componentWillUpdate`
-* [react/prefer-es6-class](docs/rules/prefer-es6-class.md): Enforce ES5 or ES6 class for React Components
-* [react/prefer-read-only-props](docs/rules/prefer-read-only-props.md): Enforce that props are read-only
-* [react/prefer-stateless-function](docs/rules/prefer-stateless-function.md): Enforce stateless React Components to be written as a pure function
-* [react/prop-types](docs/rules/prop-types.md): Prevent missing props validation in a React component definition
-* [react/react-in-jsx-scope](docs/rules/react-in-jsx-scope.md): Prevent missing `React` when using JSX
-* [react/require-default-props](docs/rules/require-default-props.md): Enforce a defaultProps definition for every prop that is not a required prop
-* [react/require-optimization](docs/rules/require-optimization.md): Enforce React components to have a `shouldComponentUpdate` method
-* [react/require-render-return](docs/rules/require-render-return.md): Enforce ES5 or ES6 class for returning value in render function
-* [react/self-closing-comp](docs/rules/self-closing-comp.md): Prevent extra closing tags for components without children (fixable)
-* [react/sort-comp](docs/rules/sort-comp.md): Enforce component methods order (fixable)
-* [react/sort-prop-types](docs/rules/sort-prop-types.md): Enforce propTypes declarations alphabetical sorting
-* [react/state-in-constructor](docs/rules/state-in-constructor.md): Enforce the state initialization style to be either in a constructor or with a class property
-* [react/static-property-placement](docs/rules/static-property-placement.md): Enforces where React component static properties should be positioned.
-* [react/style-prop-object](docs/rules/style-prop-object.md): Enforce style prop value being an object
-* [react/void-dom-elements-no-children](docs/rules/void-dom-elements-no-children.md): Prevent void DOM elements (e.g. `<img />`, `<br />`) from receiving children
 
 ## JSX-specific rules