remove bad lines leftover from merge