removing merge files