diff --git a/.gitignore b/.gitignore
index 5e80e0a..8ca9d03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 /eclipse/
 .classpath
 .project
+.claude
 /bin/
 /config/
 /crash-reports/
diff --git a/settings.gradle b/settings.gradle
index f777192..bf14114 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -23,9 +23,5 @@ pluginManagement {
 }
 
 plugins {
-<<<<<<< BlueDog_NewMachines
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.51'
-=======
     id("com.gtnewhorizons.gtnhsettingsconvention") version("2.0.7")
->>>>>>> main
 }