diff --git a/libs/shared/graph-layout/.gitignore b/libs/shared/graph-layout/.gitignore
index 4eb78c54b0e23b5fdb84ed6c7bc5534217836b58..6dd3a48abe9fd65f8a96bc29dc00b1cedab442f8 100644
--- a/libs/shared/graph-layout/.gitignore
+++ b/libs/shared/graph-layout/.gitignore
@@ -1,6 +1,11 @@
 
+<<<<<<< HEAD
 # Created by https://www.toptal.com/developers/gitignore/api/node
 # Edit at https://www.toptal.com/developers/gitignore?templates=node
+=======
+# Created by https://www.toptal.com/developers/gitignore/api/node,visualstudiocode
+# Edit at https://www.toptal.com/developers/gitignore?templates=node,visualstudiocode
+>>>>>>> feat/refactor-schema-panel
 
 ### Node ###
 # Logs
@@ -142,4 +147,25 @@ dist
 # SvelteKit build / generate output
 .svelte-kit
 
-# End of https://www.toptal.com/developers/gitignore/api/node
\ No newline at end of file
+### VisualStudioCode ###
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+!.vscode/*.code-snippets
+
+# Local History for Visual Studio Code
+.history/
+
+# Built Visual Studio Code Extensions
+*.vsix
+
+### VisualStudioCode Patch ###
+# Ignore all local history of files
+.history
+.ionide
+
+# Support for Project snippet scope
+
+# End of https://www.toptal.com/developers/gitignore/api/node,visualstudiocode