fix(Dependencies): Merge conflicts

Author: philipbrembeck

package-lock.json

@@ -22,20 +22,10 @@
     "quagga": "^0.12.1",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-<<<<<<< Updated upstream
-    "sass": "^1.60.0",
-    "typescript": "5.0.2"
-=======
-<<<<<<< Updated upstream
-    "sass": "^1.58.3",
-    "typescript": "4.9.5"
-=======
     "sass": "^1.60.0",
     "typescript": "5.0.2"
   },
   "devDependencies": {
     "@playwright/test": "^1.32.1"
->>>>>>> Stashed changes
->>>>>>> Stashed changes
   }
 }