Fix up merge