Fix merge conflicts

package.json

@@ -20,8 +20,7 @@
     "test:coverage": "npm run test -- --coverage --coverageReporters=text --coverageReporters=text-summary",
     "test:ci": "npm run test:coverage -- --coverageReporters=clover --ci",
     "test:pretty": "npm run test:coverage -- --coverageReporters=html",
-    "test:verbose": "npm run test -- --verbose",
-    "mutate": "./node_modules/.bin/stryker run --concurrency 4 --ignoreStatic"
+    "test:verbose": "npm run test -- --verbose"
   },
   "dependencies": {
     "@babel/preset-env": "^7.20.2",
@@ -71,11 +70,8 @@
     "workbox-strategies": "^6.5.4"
   },
   "devDependencies": {
-    "@shlinkio/eslint-config-js-coding-standard": "~2.0.2",
+    "@shlinkio/eslint-config-js-coding-standard": "~2.1.0",
     "@shlinkio/stylelint-config-css-coding-standard": "~1.0.1",
-    "@stryker-mutator/core": "^6.3.1",
-    "@stryker-mutator/jest-runner": "^6.3.1",
-    "@stryker-mutator/typescript-checker": "^6.3.1",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^14.4.3",
@@ -91,7 +87,7 @@
     "@types/react-dom": "^18.0.10",
     "@types/react-tag-autocomplete": "^6.3.0",
     "@types/uuid": "^8.3.4",
-    "@vitejs/plugin-react": "^3.0.0",
+    "@vitejs/plugin-react": "^3.1.0",
     "adm-zip": "^0.5.10",
     "babel-jest": "^29.3.1",
     "chalk": "^5.2.0",
@@ -102,12 +98,11 @@
     "jest-environment-jsdom": "^29.3.1",
     "resize-observer-polyfill": "^1.5.1",
     "sass": "^1.57.1",
-    "stryker-cli": "^1.0.2",
     "stylelint": "^14.16.0",
     "ts-mockery": "^1.2.0",
     "typescript": "^4.9.4",
-    "vite": "^4.0.3",
-    "vite-plugin-pwa": "^0.14.0"
+    "vite": "^4.1.1",
+    "vite-plugin-pwa": "^0.14.1"
   },
   "browserslist": [
     ">0.2%",