diff --git a/.gitattributes b/.gitattributes
index e0c567b..30ce99b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,3 @@
 gradle.properties merge=ours
 src/main/resources/META-INF/mods.toml merge=ours
+src/main/resources/META-INF/neoforge.mods.toml merge=ours