diff --git a/.gitignore b/.gitignore
index 3a67958..f16d258 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,11 +6,19 @@
 # Node artifact files
 node_modules/
 dist/
+<<<<<<< HEAD
 build/*
 release/*
 save/*
 .cache/*
 .vscode/*
+=======
+/build
+build/
+release/
+/release
+
+>>>>>>> ff2cd37 (增加屏蔽文件)
 # Compiled Java class files
 *.class
 
diff --git a/.vscode/settings.json b/.vscode/settings.json
index f8394af..8fcdc3d 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -80,6 +80,7 @@
         "qtabbar": "cpp",
         "qdatetime": "cpp",
         "bitset": "cpp",
+<<<<<<< HEAD
         "regex": "cpp",
         "ranges": "cpp",
         "any": "cpp",
@@ -105,6 +106,9 @@
         "qframe": "cpp",
         "qpixmap": "cpp",
         "qpainter": "cpp"
+=======
+        "regex": "cpp"
+>>>>>>> ff2cd37 (增加屏蔽文件)
     },
     "editor.gotoLocation.alternativeDeclarationCommand": "editor.action.revealDefinition",
     "editor.gotoLocation.alternativeDefinitionCommand": "editor.action.revealDefinition",