update

packages/app/test/cypress/integration/20-basic-features/access-to-page.spec.ts

@@ -74,6 +74,7 @@ context('Access to /me page', () => {
   //   cy.visit('/me/drafts');
   //   cy.screenshot(`${ssPrefix}-draft-page`);
   // });
+
 });
 
 
@@ -108,7 +109,7 @@ context('Access to special pages', () => {
     cy.getByTestid('grw-tags-list').should('be.visible');
     cy.getByTestid('grw-tags-list').contains('You have no tag, You can set tags on pages');
 
-    cy.getByTestid('tags-page', { timeout: 10000 }).should('be.visible');
+    cy.getByTestid('tags-page').should('be.visible');
     cy.screenshot(`${ssPrefix}-tags`);
   });
 

packages/app/test/cypress/integration/20-basic-features/use-tools.spec.ts

@@ -248,11 +248,7 @@ context('Tag Oprations', () =>{
     });
 
     cy.get('.toast').should('be.visible').trigger('mouseover');
-<<<<<<< HEAD
-    cy.get('.grw-taglabels-container > div > a').contains(tag).should('exist');
-=======
     cy.get('.grw-taglabels-container > .grw-tag-labels > a', { timeout: 10000 }).contains(tag).should('exist');
->>>>>>> master
     /* eslint-disable cypress/no-unnecessary-waiting */
     cy.wait(150); // wait for toastr to change its color occured by mouseover
     cy.screenshot(`${ssPrefix}4-click-done`, {capture: 'viewport'});