It appears, according to this blog post, that the Update just released for Lab Management has many other updates in it around all functions of TFS. One of my clients was experiencing unexpected behavior during merges that this will hopefully address. I would apply it asap.
Important Update for TFS 2010
Published
Woody Press 