TFS Merging Infinite Loop Madness

I made a bug fix to the trunk of one of my projects, which included a change to the project file. When I tried to merge the trunk into my development branch in TFS, I double clicked on the solution file before I commited my changes.

Now, Visual Studio is reporting this error message in a dialog box, and clicking OK causes it to reappear over and over and over again.

TF14093: ‘The item $foo\branches\foo-development\src\blah.csproj’ has a pending merge conflict, please run resolve before pending a change against it.

Hmm, where’s that pesky Run Resolve command again? Is it not possible to review pending changes in Visual Studio after a merge but before a commit when a project file has been modified?