diff --git a/package-lock.json b/package-lock.json
index a9bd618e5..3bc04e680 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1482,8 +1482,6 @@
         "pubsub-js": "1.9.4",
         "react-intl": "2.9.0",
         "universal-cookie": "4.0.4"
-<<<<<<< HEAD
-=======
       },
       "dependencies": {
         "axios": {
@@ -1537,7 +1535,6 @@
             "invariant": "^2.1.1"
           }
         }
->>>>>>> 8879e59 (fix: ran npm install for lodash-es)
       }
     },
     "@edx/new-relic-source-map-webpack-plugin": {