Remove files resurrected in merge.