diff --git a/lib/vscode/.eslintignore b/lib/vscode/.eslintignore
index 8f577296..d397dae4 100644
--- a/lib/vscode/.eslintignore
+++ b/lib/vscode/.eslintignore
@@ -14,9 +14,6 @@
 **/extensions/**/build/**
 **/extensions/markdown-language-features/media/**
 **/extensions/typescript-basics/test/colorize-fixtures/**
-<<<<<<< HEAD
+**/extensions/**/dist/**
 # This is a code-server code symlink.
 src/vs/base/node/proxy_agent.ts
-=======
-**/extensions/**/dist/**
->>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4