title: Can't check in due to conflicting changes
body: <p>I have an issue that means I cannot check in changes even if I resolve the issues.</p>
  
  <p>I have removed a form from the solution then created a new form with the same name.  Now when I go to check in the form I get the following error:
  <a href="http://img148.imageshack.us/img148/144/errorm.png" rel="nofollow noreferrer">http://img148.imageshack.us/img148/144/errorm.png</a></p>
  
  <p>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.</p>
  
  <p>How can I get this to check in?</p>