Humm, weird - this file was the deleted? (If so, probably when I fixed the merge conflict I added it by mistake...)