1 files changed, 1 insertions, 1 deletions

diff --git a/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/FieldEntry.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/FieldEntry.java
index b4ad1bac..aaa0798c 100644
--- a/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/FieldEntry.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/FieldEntry.java
@@ -85,7 +85,7 @@ public class FieldEntry extends ParentedEntry<ClassEntry> implements Comparable<
 
         @Override
         public boolean canConflictWith(Entry<?> entry) {
-                return false;
+                return entry instanceof FieldEntry fieldEntry && fieldEntry.getParent().equals(parent);
         }
 
         @Override