Eric clean up extraneous merge backup files