diff --git a/e2e-tests/cypress/tests/cypress/support/step_definitions/user_authentication_steps.ts b/e2e-tests/cypress/tests/cypress/support/step_definitions/user_authentication_steps.ts
index 50701098c..17743ebe5 100644
--- a/e2e-tests/cypress/tests/cypress/support/step_definitions/user_authentication_steps.ts
+++ b/e2e-tests/cypress/tests/cypress/support/step_definitions/user_authentication_steps.ts
@@ -21,26 +21,15 @@ When(
         req.body.hasOwnProperty("query") &&
         req.body.query.includes("mutation")
       ) {
-<<<<<<< Updated upstream
         req.alias = "login";
-=======
-        req.alias = "loging";
->>>>>>> Stashed changes
       }
     });
 
     loginPage.enterEmail(email);
     loginPage.enterPassword(password);
     loginPage.submitLogin();
-<<<<<<< Updated upstream
     cy.wait("@login").then((interception) => {
       expect(interception.response.statusCode).equals(200);
-      expect(JSON.stringify(interception.response.body)).contains(email);
-=======
-
-    cy.wait("@loging").then((interception) => {
-      expect(interception.response.statusCode).equals(200);
->>>>>>> Stashed changes
     });
   }
 );