@@ -54,25 +54,16 @@
     "@babel/core": "^8.0.1",
     "@babel/preset-env": "^8.0.2",
     "@jupyterlab/builder": "^4.5.10",
-<<<<<<< before updating
-    "babel-jest": "^30.4.1",
-=======
     "babel-jest": "^30.5.1",
->>>>>>> after updating
     "cpy-cli": "^7.0.0",
     "isomorphic-fetch": "^3.0.0",
     "jest": "^30.5.1",
     "jest-environment-jsdom": "^30.5.1",
     "jest-junit": "^17.0.0",
     "jest-transform-css": "^6.0.3",
     "mkdirp": "^3.0.1",
-<<<<<<< before updating
-    "oxfmt": "^0.65.0",
-    "oxlint": "^1.80.0",
-=======
     "oxfmt": "^0.66.0",
     "oxlint": "^1.81.0",
->>>>>>> after updating
     "rimraf": "^6.1.3"
   }
 }