Changed conflicted file dialog.