Delete file that should have been removed by previous merge.