Repaired incorrect merge.