Mended a broken merge.