Fix conflicts from merge.