Repaired a failed merge.