diff --git a/ui/desktop/tests/end2end/test-helpers.js b/ui/desktop/tests/end2end/test-helpers.js
index e99b95dc7..80282aaf6 100644
--- a/ui/desktop/tests/end2end/test-helpers.js
+++ b/ui/desktop/tests/end2end/test-helpers.js
@@ -9,11 +9,7 @@ const path = require('path');
  */
 exports.generateScreenshotPath = (screenshotTestDirectory, fileName) => {
   const screenshotFormat = '.png';
-<<<<<<< HEAD
   const screenshotsRootPath = path.join(__dirname, 'screenshots');
-=======
-  const screenshotsRootPath = path.join(__dirname, '/screenshots/');
->>>>>>> 8c489b81 (refactor: 💡 Create generateScreenshotPath as test helper)
   const screenshotPath = path.join(
     screenshotsRootPath,
     screenshotTestDirectory