remove leftover from merge failure