Fix up merge problems