diff --git a/.husky/pre-commit b/.husky/pre-commit
index 1525982..d24fdfc 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,2 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
+
+npx lint-staged
diff --git a/package.json b/package.json
index f1229e2..22239cb 100644
--- a/package.json
+++ b/package.json
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 {
   "name": "itb-frontend",
   "version": "0.1.0",
@@ -76,82 +75,3 @@
     "typescript": "^5"
   }
 }
-=======
-{
-  "name": "itb-frontend",
-  "version": "0.1.0",
-  "private": true,
-  "type": "module",
-  "scripts": {
-    "dev": "next dev --turbo",
-    "build": "next build",
-    "start": "next start",
-    "lint": "next lint",
-    "lint:css": "stylelint --fix styles/**/*.css src/styles/**/*.css",
-    "preview": "vite preview",
-    "format": "prettier --write .",
-    "test": "jest",
-    "prepare": "husky install",
-    "generate-sitemap": "node tools/generate-sitemap.js",
-    "storybook": "storybook dev -p 6006",
-    "build-storybook": "storybook build",
-    "chromatic": "npx chromatic --project-token=chpt_206aae9e47c1b42"
-  },
-  "lint-staged": {
-    ".{js,jsx,ts,tsx}": [
-      "eslint --no-error-on-unmatched-pattern --fix",
-      "./tools/remove_comments {src/**/,app/*/}",
-      "prettier --write"
-    ],
-    "*.{html,css,md}": [
-      "prettier --write"
-    ]
-  },
-  "dependencies": {
-    "@reduxjs/toolkit": "^2.2.7",
-    "axios": "^1.7.5",
-    "jose": "^5.7.0",
-    "js-cookie": "^3.0.5",
-    "lucide-react": "^0.427.0",
-    "next": "14.2.5",
-    "react": "^18",
-    "react-dom": "^18",
-    "react-loading-skeleton": "^3.4.0",
-    "react-redux": "^9.1.2",
-    "redux": "^5.0.1",
-    "sitemap": "^8.0.0"
-  },
-  "devDependencies": {
-    "@chromatic-com/storybook": "^1.6.1",
-    "@playwright/test": "^1.46.1",
-    "@storybook/addon-essentials": "^8.2.9",
-    "@storybook/addon-interactions": "^8.2.9",
-    "@storybook/addon-links": "^8.2.9",
-    "@storybook/addon-onboarding": "^8.2.9",
-    "@storybook/blocks": "^8.2.9",
-    "@storybook/nextjs": "^8.2.9",
-    "@storybook/react": "^8.2.9",
-    "@storybook/test": "^8.2.9",
-    "@types/jest": "^29.5.12",
-    "@types/js-cookie": "^3.0.6",
-    "@types/node": "^22.2.0",
-    "@types/prop-types": "^15.7.12",
-    "@types/react": "^18.3.3",
-    "@types/react-dom": "^18.3.0",
-    "chromatic": "^11.7.1",
-    "eslint": "^8",
-    "eslint-config-next": "14.2.5",
-    "eslint-plugin-storybook": "^0.8.0",
-    "husky": "^9.1.4",
-    "jest": "^29.7.0",
-    "lint-staged": "^15.2.9",
-    "prettier": "3.3.3",
-    "storybook": "^8.2.9",
-    "stylelint": "^16.8.1",
-    "stylelint-config-standard": "^36.0.0",
-    "ts-jest": "^29.2.4",
-    "ts-node": "^10.9.2",
-    "typescript": "^5"
-  }
-}
->>>>>>> origin/main