diff --git a/.eslintignore b/.eslintignore
index 2d7c565d32494..cdcaed49e239b 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,4 +1,5 @@
 # We can probably lint these later but not important at this point
+addons/
 src/renderers/art
 src/shared/vendor
 # But not in docs/_js/examples/*
@@ -9,11 +10,8 @@ docs/_site/
 docs/vendor/bundle/
 # This should be more like examples/**/thirdparty/** but
 # we should fix https://github.com/facebook/esprima/pull/85 first
-<<<<<<< HEAD
 examples/
-=======
 fixtures/
->>>>>>> 4a37718... Remove examples/ folder (#9323)
 # Ignore built files.
 build/
 coverage/
diff --git a/src/isomorphic/classic/class/__tests__/ReactCreateClass-test.js b/src/isomorphic/classic/class/__tests__/ReactCreateClass-test.js
index 9c1a44ea5d025..267f5f8ad9c3e 100644
--- a/src/isomorphic/classic/class/__tests__/ReactCreateClass-test.js
+++ b/src/isomorphic/classic/class/__tests__/ReactCreateClass-test.js
@@ -367,7 +367,7 @@ describe('ReactClass-spec', () => {
       render() {
         ops.push('Render: ' + this.state.step);
         return <div />;
-      }
+      },
     });
 
     var instance = ReactTestUtils.renderIntoDocument(<Component />);
@@ -414,7 +414,7 @@ describe('ReactClass-spec', () => {
         instance = this;
         this.log('render');
         return <div />;
-      }
+      },
     });
 
     var container = document.createElement('div');