Fix up merge error