Fixed conflicts from merge.