remove accidentally committed merge files