diff --git a/.eslintignore b/.eslintignore
index e35cabbe24..9e34b3efdb 100755
--- a/.eslintignore
+++ b/.eslintignore
@@ -8,9 +8,6 @@ node_modules/
 demos/assets/
 demos/index.html
 demos/*
-<<<<<<< HEAD
 rollup/*
 webpack/*
-=======
-src/core/three.js
->>>>>>> master
+src/core/three.js
\ No newline at end of file