Windows Hide Folder Merge Conflicts