diff --git a/package.json b/package.json
index 2b91ed2..9e2923e 100644
--- a/package.json
+++ b/package.json
@@ -18,9 +18,9 @@
     "eslint-config-airbnb": "^16.1.0",
     "eslint-config-prettier": "^2.9.0",
     "eslint-plugin-import": "^2.11.0",
+    "eslint-plugin-prettier": "^2.6.1",
     "eslint-plugin-jest": "^21.18.0",
     "eslint-plugin-jsx-a11y": "^6.1.0",
-    "eslint-plugin-prettier": "^2.6.2",
     "eslint-plugin-react": "^7.9.1",
     "prettier": "^1.14.0",
     "prettier-eslint": "^8.8.1"
diff --git a/yarn.lock b/yarn.lock
index b28733e..8ec24c3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -439,9 +439,15 @@ eslint-plugin-jsx-a11y@^6.1.0:
     has "^1.0.3"
     jsx-ast-utils "^2.0.1"
 
+<<<<<<< HEAD
+eslint-plugin-prettier@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.6.1.tgz#de902b4a66b7bca24296429a59a1cc04020ccbbd"
+=======
 eslint-plugin-prettier@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.6.2.tgz#71998c60aedfa2141f7bfcbf9d1c459bf98b4fad"
+>>>>>>> origin/master
   dependencies:
     fast-diff "^1.1.1"
     jest-docblock "^21.0.0"