removed obsolete merge files