remove leftover from merge conflict