diff --git a/.gitignore b/.gitignore
index 5a77e05527b..749f5a6b2c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-.vscode
-.vscode-extensions
 testdata
 sphinx-env
 *.pyc
@@ -27,11 +25,11 @@ venv
 .venv
 user.mk
 .vscode
-<<<<<<< HEAD
 shell.nix
 vscode.sh
 clean.sh
 .envrc
 .vscode-extensions
+.vscode
 core
 .env