diff --git a/packages/techdocs-cli/cypress.config.js b/packages/techdocs-cli/cypress.config.js
index b33ab2eace..abaa324d76 100644
--- a/packages/techdocs-cli/cypress.config.js
+++ b/packages/techdocs-cli/cypress.config.js
@@ -21,25 +21,9 @@ module.exports = defineConfig({
     setupNodeEvents(on, config) {
       initPlugin(on, config);
     },
-<<<<<<< HEAD
+
     excludeSpecPattern: ['**/__snapshots__/*', '**/__image_snapshots__/*'],
   },
-
-=======
-  },
-  excludeSpecPattern: ['**/__snapshots__/*', '**/__image_snapshots__/*'],
-  env: {
-    mkDocsBaseUrl: 'http://localhost:8000',
-    backstageBaseUrl: 'http://localhost:3000',
-    'cypress-plugin-snapshots': {
-      autoCleanUp: false,
-      imageConfig: {
-        resizeDevicePixelRatio: true,
-        threshold: 0.01,
-      },
-    },
-  },
->>>>>>> 533a1a2db2 (update to cypress 10)
   viewportWidth: 1920,
   viewportHeight: 1080,
   includeShadowDom: true,