diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json
index 4290118e..cb31df12 100644
--- a/{{cookiecutter.project_slug}}/package.json
+++ b/{{cookiecutter.project_slug}}/package.json
@@ -38,6 +38,7 @@
         "typed.js": "^2.0.11"
     },
     "devDependencies": {
+<<<<<<< HEAD
         "bourbon": "^7.0.0",
         "browser-sync": "^2.26.14",
         "commitizen": "^4.2.3",
@@ -66,6 +67,36 @@
         "stylelint-config-sass-guidelines": "^8.0.0",
         "stylelint-config-standard": "^20.0.0",
         "time-grunt": "^2.0.0"
+=======
+    "bourbon": "^7.0.0",
+    "browser-sync": "^2.26.14",
+    "commitizen": "^4.2.3",
+    "cz-conventional-changelog": "^3.3.0",
+    "cz-emoji": "^1.3.1",
+    "grunt": "^1.3.0",
+    "grunt-browser-sync": "^2.2.0",
+    "grunt-contrib-clean": "^2.0.0",
+    "grunt-contrib-copy": "^1.0.0",
+    "grunt-contrib-cssmin": "^4.0.0",
+    "grunt-contrib-htmlmin": "^3.1.0",
+    "grunt-contrib-uglify": "^5.0.0",
+    "grunt-contrib-watch": "^1.1.0",
+    "grunt-conventional-changelog": "^6.1.0",
+    "grunt-json-minification": "^0.2.1",
+    "grunt-newer": "^1.3.0",
+    "grunt-sass": "^3.1.0",
+    "grunt-stylelint": "^0.16.0",
+    "holderjs": "^2.9.9",
+    "load-grunt-tasks": "^5.1.0",
+    "node-sass": "^5.0.0",
+    "normalize.css": "^8.0.1",
+    "popper.js": "^1.16.1",
+    "stylelint": "^13.12.0",
+    "stylelint-config-prettier": "^8.0.2",
+    "stylelint-config-sass-guidelines": "^8.0.0",
+    "stylelint-config-standard": "^21.0.0",
+    "time-grunt": "^2.0.0"
+>>>>>>> b2209616fc7b8c044566c8bb966e379c21506c68
     },
     "browserslist": [
         "defaults",
diff --git a/{{cookiecutter.project_slug}}/requirements.txt b/{{cookiecutter.project_slug}}/requirements.txt
index 46527900..44ec4837 100644
--- a/{{cookiecutter.project_slug}}/requirements.txt
+++ b/{{cookiecutter.project_slug}}/requirements.txt
@@ -252,7 +252,7 @@ phonenumbers==8.12.19
     # via -r {{cookiecutter.project_slug}}/requirements.in
 phonenumberslite==8.12.10
     # via faker-e164
-pillow==8.1.1
+pillow==8.1.2
     # via wagtail
 pip-api==0.0.14
     # via isort
diff --git a/{{cookiecutter.project_slug}}/yarn.lock b/{{cookiecutter.project_slug}}/yarn.lock
index 8f8b5312..418cf779 100644
--- a/{{cookiecutter.project_slug}}/yarn.lock
+++ b/{{cookiecutter.project_slug}}/yarn.lock
@@ -5239,10 +5239,10 @@ stylelint-config-prettier@^8.0.2:
   resolved "https://registry.yarnpkg.com/stylelint-config-prettier/-/stylelint-config-prettier-8.0.2.tgz#da9de33da4c56893cbe7e26df239a7374045e14e"
   integrity sha512-TN1l93iVTXpF9NJstlvP7nOu9zY2k+mN0NSFQ/VEGz15ZIP9ohdDZTtCWHs5LjctAhSAzaILULGbgiM0ItId3A==
 
-stylelint-config-recommended@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-3.0.0.tgz#e0e547434016c5539fe2650afd58049a2fd1d657"
-  integrity sha512-F6yTRuc06xr1h5Qw/ykb2LuFynJ2IxkKfCMf+1xqPffkxh0S09Zc902XCffcsw/XMFq/OzQ1w54fLIDtmRNHnQ==
+stylelint-config-recommended@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-4.0.0.tgz#665a0034065e6704d5032ba51bf4efa37d328ef9"
+  integrity sha512-sgna89Ng+25Hr9kmmaIxpGWt2LStVm1xf1807PdcWasiPDaOTkOHRL61sINw0twky7QMzafCGToGDnHT/kTHtQ==
 
 stylelint-config-sass-guidelines@^8.0.0:
   version "8.0.0"
@@ -5252,12 +5252,12 @@ stylelint-config-sass-guidelines@^8.0.0:
     stylelint-order "^4.0.0"
     stylelint-scss "^3.18.0"
 
-stylelint-config-standard@^20.0.0:
-  version "20.0.0"
-  resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-20.0.0.tgz#06135090c9e064befee3d594289f50e295b5e20d"
-  integrity sha512-IB2iFdzOTA/zS4jSVav6z+wGtin08qfj+YyExHB3LF9lnouQht//YyB0KZq9gGz5HNPkddHOzcY8HsUey6ZUlA==
+stylelint-config-standard@^21.0.0:
+  version "21.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-21.0.0.tgz#4942cfa27301eb6702fa8fc46a44da35d1a5cfd7"
+  integrity sha512-Yf6mx5oYEbQQJxWuW7X3t1gcxqbUx52qC9SMS3saC2ruOVYEyqmr5zSW6k3wXflDjjFrPhar3kp68ugRopmlzg==
   dependencies:
-    stylelint-config-recommended "^3.0.0"
+    stylelint-config-recommended "^4.0.0"
 
 stylelint-order@^4.0.0:
   version "4.1.0"