remove accidentally added merge files