diff --git a/test/cypress/integration/shelving/parking/parkingList.spec.js b/test/cypress/integration/shelving/parking/parkingList.spec.js
index 466868bf4..7372da164 100644
--- a/test/cypress/integration/shelving/parking/parkingList.spec.js
+++ b/test/cypress/integration/shelving/parking/parkingList.spec.js
@@ -2,11 +2,7 @@
 describe('ParkingList', () => {
     const searchbar = '#searchbar input';
     const firstCard = ':nth-child(1) > .q-card > .no-margin > .q-py-none';
-<<<<<<< HEAD
     const summaryHeader = '.header-link';
-=======
-    const summaryHeader = '.summaryBody .header';
->>>>>>> b39aeb46a2c5da08287888495414dbaba49cd5d8
 
     beforeEach(() => {
         cy.viewport(1920, 1080);