Fix conflict from merge.