Update package.json

Author: timkpaine

js/package.json

@@ -59,15 +59,9 @@
     "eslint": "^8.57.1",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-base": "^15.0.0",
-<<<<<<< before updating
-    "eslint-config-prettier": "^10.0.1",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jest": "^28.5.0",
-=======
     "eslint-config-prettier": "^10.1.5",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jest": "^28.11.0",
->>>>>>> after updating
     "eslint-plugin-json": "^3.1.0",
     "eslint-plugin-prettier": "^5.4.0",
     "isomorphic-fetch": "^3.0.0",