remove file leftover from merge