While trying to check in my files I had to do a merge. I performed the merge and saved the conflicted file. When I closed the merge tool, the merge window still showed the file as needing a merge. I made the mistake of closing the merge window at that point. I'm not sure what to do to get back into that merge window. I can't check-in anymore because it says I'm in the middle of the merge. I've tried double-clicking on the merge-link shown at the bottom of Pending Changes as well as right clickin