diff --git a/package.json b/package.json
index b0fed987..6e480529 100644
--- a/package.json
+++ b/package.json
@@ -74,13 +74,8 @@
     "test:verbose": "jest --coverage --verbose",
     "test:e2e:account": "dotenvx run -f env-files/account.template.env -- jest --silent --runInBand --detectOpenHandles --testRegex 'account-api/.*\\.e2e-spec\\.ts'",
     "test:e2e:content-publishing": "dotenvx run -f env-files/content-publishing.template.env -- jest --testRegex \".e2e-spec.ts\" --detectOpenHandles 'content-publishing*'",
-<<<<<<< Updated upstream
     "test:e2e:content-watcher": "dotenvx run -f env-files/content-watcher.template.env -- jest --testRegex \".e2e-spec.ts\" --detectOpenHandles 'content-watcher*'",
     "test:e2e:graph": "dotenvx run -f env-files/graph.template.env -- jest --testRegex \".e2e-spec.ts\" --detectOpenHandles 'graph*'",
-=======
-    "test:e2e:content-watcher": "dotenvx run -f .env.content-watcher -- jest --testRegex \".e2e-spec.ts\" --detectOpenHandles 'content-watcher*'",
-    "test:e2e:graph": "dotenvx run -f .env.graph -- jest --testRegex \".e2e-spec.ts\" --detectOpenHandles 'graph*'",
->>>>>>> Stashed changes
     "format": "prettier --write .",
     "lint": "eslint apps/**/*.[tj]s libs/**/*.[tj]s",
     "lint:account": "eslint apps/account*/**/*.[tj]s libs/account-lib/**/*.[tj]s",