Undo change to directive merge that broke tests

packages/amplify-graphql-model-transformer/src/graphql-model-transformer.ts

@@ -234,8 +234,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
 
     // This property override is specifically to address parity between V1 and V2 when the FF is disabled
     // If one subscription is defined, just let the others go to null without FF. But if public and none defined, default all subs
-    if (!ctx.featureFlags.getBoolean('shouldDeepMergeDirectiveConfigDefaults', false)
-          && options?.subscriptions?.level === SubscriptionLevel.public) {
+    if (!ctx.featureFlags.getBoolean('shouldDeepMergeDirectiveConfigDefaults', false)) {
       const publicSubscriptionDefaults = {
         onCreate: [getFieldNameFor('onCreate', typeName)],
         onDelete: [getFieldNameFor('onDelete', typeName)],
@@ -251,7 +250,8 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
         },
         ctx.featureFlags,
       );
-      if (!(baseArgs?.subscriptions?.onCreate || baseArgs?.subscriptions?.onDelete || baseArgs?.subscriptions?.onUpdate)) {
+      if (baseArgs?.subscriptions?.level === SubscriptionLevel.public
+        && !(baseArgs?.subscriptions?.onCreate || baseArgs?.subscriptions?.onDelete || baseArgs?.subscriptions?.onUpdate)) {
         options.subscriptions = { level: SubscriptionLevel.public, ...publicSubscriptionDefaults };
       }
     }