Show or Hide Folder Merge Conflicts