getting rid of merge files