From 53df153162dda960b8e64328bf05a469b8ba79d7 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Mon, 27 Apr 2026 21:53:35 -0400
Subject: [PATCH] Fix name conflict

---
 CHANGELIST.md                              | 1 +
 MPF.UI/Windows/MediaInformationWindow.xaml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELIST.md b/CHANGELIST.md
index 2f497903..fd2d3e2c 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -10,6 +10,7 @@
 - Ensure Wii and WiiU are output with correct fields
 - Add more placeholder values for output
 - Update RedumpLib to 1.10.2
+- Fix name conflict
 
 ### 3.7.1 (2026-03-30)
 
diff --git a/MPF.UI/Windows/MediaInformationWindow.xaml b/MPF.UI/Windows/MediaInformationWindow.xaml
index a655ee1b..08b54a3f 100644
--- a/MPF.UI/Windows/MediaInformationWindow.xaml
+++ b/MPF.UI/Windows/MediaInformationWindow.xaml
@@ -208,7 +208,7 @@
                                                         Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)DiscHologramID], Mode=TwoWay}"/>
                                     <controls:UserInput x:Name="DNASDiscIDTextBox" Label="DNAS Disc ID"
                                                         Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)DNASDiscID], Mode=TwoWay}"/>
-                                    <controls:UserInput x:Name="DiscIDTextBox" Label="Disc ID"
+                                    <controls:UserInput x:Name="CommentDiscIDTextBox" Label="Disc ID"
                                                         Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)DiscID], Mode=TwoWay}"/>
                                     <controls:UserInput x:Name="CoverIDTextBox" Label="Cover ID"
                                                         Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)CoverID], Mode=TwoWay}"/>