A deleted file was recreated in a merge conflict at some point
Merge pull request #94 from engineyard/remove-rebase-fail-file

A deleted file was recreated in a merge conflict at some point