diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json
index 15e4af2bf..5d8f21e45 100644
--- a/tsconfig.eslint.json
+++ b/tsconfig.eslint.json
@@ -1,10 +1,4 @@
 {
-<<<<<<< HEAD
-    "extends": "./tsconfig.json",
-    "include": ["packages/**/*"]
-}
-=======
 	"extends": "./tsconfig.json",
 	"include": ["packages/**/*"]
 }
->>>>>>> 9ec404225ef0cff5f82d759fcdc7b85952e65c0d