When doing a merge that involves a change in a cloaked file (only in the incoming change) the changes are downloaded when resolving conflicts .

Please add an option to not even show cloaked files coming in from merges or at least to not download them.