resolved some missing conflicts

Author: anr2601

package.json

@@ -23,21 +23,15 @@
     "@typescript-eslint/eslint-plugin": "^5.60.1",
     "@vitejs/plugin-react": "^4.2.1",
     "file-saver": "^2.0.5",
-<<<<<<< HEAD
     "i18next-browser-languagedetector": "^8.0.0",
     "i18next-http-backend": "^2.6.1",
-=======
->>>>>>> 45d0bd74b629ed311466970d2ae9c435d1df47a8
     "jszip": "^3.10.1",
     "lucide-react": "^0.376.0",
     "prop-types": "^15.8.1",
     "react": "^18.2.0",
     "react-chatbotify": "^2.0.0-beta.3",
     "react-dom": "^18.2.0",
-<<<<<<< HEAD
     "react-i18next": "^15.0.1",
-=======
->>>>>>> 45d0bd74b629ed311466970d2ae9c435d1df47a8
     "react-loading-skeleton": "^3.4.0",
     "react-router-dom": "^6.2.2",
     "uuid": "^9.0.1",

src/pages/Themes.tsx

@@ -163,7 +163,7 @@ const Themes: React.FC = () => {
 						</div>
 						<div className="flex flex-col justify-between items-center mb-4 mt-5 w-full">
 							<div className="bg-gray-100 rounded-lg p-4 overflow-y-auto shadow-lg w-full max-w-md">
-								<h2 className="text-center font-bold mb-4 text-lg text-gray-800">Preview Themes</h2>
+								<h2 className="text-center font-bold mb-4 text-lg text-gray-800">{t('display.pt')}</h2>
 								{previewIds.length > 0 ? (
 									<ul className="divide-y divide-gray-300">
 										{previewIds.map((id, index) => (