Deleting file which suprisingly survived a merge