This file was in conflict as well. I have no idea how to properly resolve a deletion conflict, so I punted. 

I will remove it now.