Can't check in due to conflicting changes

I have an issue that means I cannot check in changes even if I resolve the issues.

I have removed a form from the solution then开发者_如何学C created a new form with the same name. Now when I go to check in the form I get the following error: http://img148.imageshack.us/img148/144/errorm.png

Even if I mark all the conflicts as resolved the check in fails with the following error: All conflicts resolved but no files checked in due to initial conflicts.

How can I get this to check in?

Go to the source explorer and delete the files directly in there.