remove extra merge files