Fixed broken merge.