diff --git a/lib/vscode/.gitignore b/lib/vscode/.gitignore
index b324b102..11a7486b 100644
--- a/lib/vscode/.gitignore
+++ b/lib/vscode/.gitignore
@@ -5,32 +5,9 @@ Thumbs.db
 node_modules/
 .build/
 extensions/**/dist/
-<<<<<<< HEAD
-out/
-out-build/
-out-editor/
-out-editor-src/
-out-editor-build/
-out-editor-esm/
-out-editor-esm-bundle/
-out-editor-min/
-out-monaco-editor-core/
-out-vscode/
-out-vscode-min/
-out-vscode-reh/
-out-vscode-reh-min/
-out-vscode-reh-pkg/
-out-vscode-reh-web/
-out-vscode-reh-web-min/
-out-vscode-reh-web-pkg/
-out-vscode-web/
-out-vscode-web-min/
-out-vscode-web-pkg/
-=======
 /out*/
 /extensions/**/out/
 src/vs/server
->>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
 resources/server
 build/node_modules
 coverage/