Get rid of some old merge files