Fix up merge.