Drop leftover from merge conflict