Fix failed merge.