Show filename in DeleteConflictDlg and fix optics