diff --git a/sequencing-server/package-lock.json b/sequencing-server/package-lock.json
index a22efbba7d..747a91041a 100644
--- a/sequencing-server/package-lock.json
+++ b/sequencing-server/package-lock.json
@@ -10,11 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@js-temporal/polyfill": "~0.4.3",
-<<<<<<< HEAD
         "@nasa-jpl/aerie-ampcs": "~1.0.6",
-=======
-        "@nasa-jpl/aerie-ampcs": "~1.0.5",
->>>>>>> 114d4eb22 (update package-lock with new version of aerie-ts-code-runner in sequencing-server)
         "@nasa-jpl/aerie-ts-user-code-runner": "~0.7.0",
         "@nasa-jpl/seq-json-schema": "1.0.20",
         "body-parser": "~1.20.1",