Made an ugly checkin mistake w/ a merge conflict by doing this:

1) switch list of changes to Conflicts

2) made changes to the file to resolve the conflicts

3) right clicked on file to resolve the conflict and chose "Use Theirs" by mistake instead of "Mark Resolved" and didn't get a confirmation

4) file disappeared from Conflicts view

5) I didn't look at the file again to confirm and merged it