diff --git a/.gitignore b/.gitignore
index 7de8ea5..93cd579 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,23 @@
+<<<<<<< HEAD
 # Godot 4+ specific ignores
 .godot/
 android/
+=======
+# ---> Godot
+# Godot 4+ specific ignores
+.godot/
+
+# Godot-specific ignores
+.import/
+export.cfg
+export_presets.cfg
+
+# Imported translations (automatically generated from CSV files)
+*.translation
+
+# Mono-specific ignores
+.mono/
+data_*/
+mono_crash.*.json
+
+>>>>>>> e5c889106df912758b47dc23ee0a39485278ae3a
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..1da26fc
--- /dev/null
+++ b/README.md
@@ -0,0 +1,2 @@
+# PrincessDragonSlayer
+