Added result to conflicts dialog, for proper enabling of save buttons. Closes #966.