diff --git a/package.json b/package.json
index d072216..6766028 100644
--- a/package.json
+++ b/package.json
@@ -56,12 +56,7 @@
     "eslint-plugin-react-hooks": "^5.1.0-rc.0",
     "eslint-plugin-react-refresh": "^0.4.9",
     "globals": "^15.9.0",
-<<<<<<< HEAD
     "husky": "^9.1.6",
-=======
-    "prettier-plugin-organize-imports": "^4.1.0",
-    "typescript": "^5.6.3",
->>>>>>> 47b5ad3f36c4ecbd0e0a7dd03583c90d825bf283
     "vite": "^5.4.1"
   }
 }
diff --git a/src/components/settings/NavButton.tsx b/src/components/settings/NavButton.tsx
index 44a0f8d..8d7135f 100644
--- a/src/components/settings/NavButton.tsx
+++ b/src/components/settings/NavButton.tsx
@@ -1,10 +1,7 @@
 import { Button } from '@mui/material';
-<<<<<<< HEAD:src/components/settings/NavButton.jsx
 import PropTypes from 'prop-types';
-=======
 import { ReactNode } from 'react';
 import { Link, useLocation } from 'react-router-dom';
->>>>>>> 47b5ad3f36c4ecbd0e0a7dd03583c90d825bf283:src/components/settings/NavButton.tsx
 
 interface NavButtonProps {
   to: string;