Remove file that should have been removed during the merge.