Missing/new file. I don't know. Git's complaining about this screwing up the merge, so...