diff --git a/frontend-interface/components/DragAndDropGrid.js b/frontend-interface/components/DragAndDropGrid.js
index 444800d5..0d3823de 100644
--- a/frontend-interface/components/DragAndDropGrid.js
+++ b/frontend-interface/components/DragAndDropGrid.js
@@ -615,5 +615,4 @@ export default function DragAndDropGrid() {
             </DragDropContext>
         </div>
     );
-}
-
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index cb97e8a8..312823e5 100644
--- a/package.json
+++ b/package.json
@@ -13,21 +13,16 @@
   "dependencies": {
     "@hello-pangea/dnd": "^17.0.0",
     "@supabase/supabase-js": "^2.45.6",
-<<<<<<< Updated upstream
     "lucide-react": "^0.456.0",
     "@testing-library/react": "^13.4.0",
     "jest-fetch-mock": "^3.0.3",
     "mathjs": "^11.12.0",
-=======
-    "mathjs": "^11.8.1",
->>>>>>> Stashed changes
     "next": "14.2.16",
     "react": "^18",
     "react-dom": "^18",
     "uuid": "^10.0.0"
   },
   "devDependencies": {
-<<<<<<< Updated upstream
     "@babel/preset-env": "^7.24.0",
     "@babel/preset-react": "^7.23.3",
     "@testing-library/jest-dom": "^6.4.2",
@@ -43,8 +38,5 @@
     "setupFilesAfterEnv": [
       "<rootDir>/jest.setup.js"
     ]
-=======
-    "jest": "^29.7.0"
->>>>>>> Stashed changes
   }
-}
+}
\ No newline at end of file