diff --git a/.gitignore b/.gitignore
index 93cd579..d493214 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Godot 4+ specific ignores
 .godot/
 android/
@@ -18,6 +17,4 @@ export_presets.cfg
 # Mono-specific ignores
 .mono/
 data_*/
-mono_crash.*.json
-
->>>>>>> e5c889106df912758b47dc23ee0a39485278ae3a
+mono_crash.*.json
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..f7a0a26
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+	"godotTools.editorPath.godot4": "c:\\Program Files\\Godot_v4.3-dev5_mono_win64\\Godot_v4.3-dev5_mono_win64.exe"
+}