cleanup leftover from merge conflict