resolve merge conflict

Author: AhadAli01

scripts/rampingVUs/spikeTests/scenario2.js

@@ -15,9 +15,9 @@ export const options = {
       startVUs: 0,
       stages: [
         { duration: '30s', target: 25 },
-        { duration: '30s', target: 50 },
-        { duration: '30s', target: 75 },
         { duration: '30s', target: 100 },
+        { duration: '1m', target: 100 },
+        { duration: '30s', target: 0 },
       ],
       gracefulRampDown: '0s',
     },

scripts/rampingVUs/stressTests/scenario2.js

@@ -14,10 +14,11 @@ export const options = {
             executor: 'ramping-vus',
             startVUs: 0,
             stages: [
-                { duration: '30s', target: 25 },
-                { duration: '30s', target: 100 },
-                { duration: '1m', target: 100 },
-                { duration: '30s', target: 0 },
+                { duration: '20s', target: 10 },
+                { duration: '30s', target: 70 },
+                { duration: '10s', target: 10 },
+                { duration: '30s', target: 90 },
+                { duration: '10s', target: 10 },
             ],
             gracefulRampDown: '0s',
         },