diff --git a/packages/cli/package.json b/packages/cli/package.json
index 311e4e48cf..de447b27b5 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -38,7 +38,11 @@
     "@rollup/plugin-json": "^4.0.2",
     "@rollup/plugin-node-resolve": "^9.0.0",
     "@rollup/plugin-yaml": "^2.1.1",
+<<<<<<< HEAD
     "@spotify/eslint-config-base": "^9.0.0",
+=======
+    "@spotify/eslint-config-base": "^8.0.0",
+>>>>>>> 88203b2fdd686da88b4d9f5ebe3564be90bcdd37
     "@spotify/eslint-config-react": "^8.0.0",
     "@spotify/eslint-config-typescript": "^8.0.0",
     "@sucrase/webpack-loader": "^2.0.0",
@@ -63,11 +67,15 @@
     "eslint-config-prettier": "^6.0.0",
     "eslint-formatter-friendly": "^7.0.0",
     "eslint-plugin-import": "^2.20.2",
+<<<<<<< HEAD
     "eslint-plugin-jest": "^24.1.0",
     "eslint-plugin-jsx-a11y": "^6.2.1",
     "eslint-plugin-monorepo": "^0.3.1",
     "eslint-plugin-react": "^7.12.4",
     "eslint-plugin-react-hooks": "^4.0.0",
+=======
+    "eslint-plugin-monorepo": "^0.3.1",
+>>>>>>> 88203b2fdd686da88b4d9f5ebe3564be90bcdd37
     "fork-ts-checker-webpack-plugin": "^4.0.5",
     "fs-extra": "^9.0.0",
     "handlebars": "^4.7.3",
diff --git a/yarn.lock b/yarn.lock
index 546a167361..c31e12127d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3801,10 +3801,17 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
+<<<<<<< HEAD
 "@spotify/eslint-config-base@^8.1.0":
   version "9.0.0"
   resolved "https://registry.npmjs.org/@spotify/eslint-config-base/-/eslint-config-base-9.0.0.tgz#e122b2e6d1a11750170badc5be6774ded95953d2"
   integrity sha512-LNGY6bBM0IlosvMIx9Ic5gqatpa5LPvrJhN4RnrUnP9oaXNLgPTKDE89p3eC5Tnh78ADdX4HD+rbHDSyP2tBgg==
+=======
+"@spotify/eslint-config-base@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.npmjs.org/@spotify/eslint-config-base/-/eslint-config-base-8.0.0.tgz#c3d10d8a05ad9129d579952cb80063e4c4fa216e"
+  integrity sha512-07Fo+KoTMl4AaZJPD6deFnYmG634wzgeqfFcWdFlIrOLAasvWSH8Lp6ZE9cJBKuffOAy8kuEE1SwFo34+5X8bQ==
+>>>>>>> 88203b2fdd686da88b4d9f5ebe3564be90bcdd37
 
 "@spotify/eslint-config-oss@^1.0.1":
   version "1.0.2"