Fixed failed merge.