test: fix-merge-conflict

tests/playwright-tests/src/tests/e2e/epic4c-add-participant-tests/epic4c-10011-10012-testsuite.spec.ts

@@ -30,7 +30,7 @@ test.describe('@DTOSS-3881-01 @e2e @epic4c- Cohort Manger subscribed the Added r
       await validators(response);
     });
 
-    await test.step('Then NHSNumber, GivenName, FamilyName is written to Participant Demographic table', async () => {
+    await test.step('Then NHSNumber, GivenName, FamilyName is written into Participant Demographic table', async () => {
       const response = await retry(
         () => getRecordsFromParticipantDemographicService(request),
         (res) =>
@@ -44,7 +44,7 @@ test.describe('@DTOSS-3881-01 @e2e @epic4c- Cohort Manger subscribed the Added r
       expect(response?.data?.[0]?.FamilyName).toBe("Doe");
     });
 
-    await test.step('And NHSNumber, ScreeningId, ReferralFlag is written to Participant Management table', async () => {
+    await test.step('And NHSNumber, ScreeningId, ReferralFlag is written into Participant Management table', async () => {
       const response = await retry(
         () => getRecordsFromParticipantManagementService(request),
         (res) =>
@@ -58,7 +58,6 @@ test.describe('@DTOSS-3881-01 @e2e @epic4c- Cohort Manger subscribed the Added r
       expect(response?.data?.[0]?.ReferralFlag).toBe(1);
     });
 
-<<<<<<< HEAD:tests/playwright-tests/src/tests/e2e/epic4c-add-participant-tests/epic4c-10011-10012-testsuite.spec.ts
     await test.step('DTOSS-10012 DTOSS-10012 verify NemsSubscription_Id in NEMS_SUBSCRIPTION table', async () => {
       const nhsNumber = participantData['inputParticipantRecord'].u_case_variable_data.nhs_number;
 
@@ -76,15 +75,6 @@ test.describe('@DTOSS-3881-01 @e2e @epic4c- Cohort Manger subscribed the Added r
         },
         { retries: 5, delayMs: 2000 }
       );
-=======
-    await test.step('DTOSS-10012 ADD verify NemsSubscription in NEMS_SUBSCRIPTION table', async () => {
-      const nhsNumber = participantData['inputParticipantRecord'].u_case_variable_data.nhs_number;
-      const response = await getRecordsFromNemsSubscription(request, nhsNumber);
-      const validators = composeValidators(
-        expectStatus(200)
-      );
-      await validators(response);
->>>>>>> e9abb1665a60258957de73ecf486b199808e514a:tests/playwright-tests/src/tests/e2e/epic4c-add-participant-tests/epic4c-testsuite.spec.ts
       const subscriptionID = extractSubscriptionID(response);
       expect(subscriptionID).not.toBeNull();
       console.log(`Extracted Subscription ID: ${subscriptionID} for number: ${nhsNumber}`);