This file has now been removed and gives a merge conflict. I'll resolve.