Fix display of conflicts in the main view when 'show-changes' is enabled