diff --git a/package.json b/package.json
index d7de05b411..0644cdd692 100644
--- a/package.json
+++ b/package.json
@@ -137,10 +137,7 @@
     "passport-google-auth": "^1.0.2",
     "prettier": "^1.19.1",
     "proxyquire": "^2.1.3",
-<<<<<<< teamsAddon
-=======
     "rimraf": "^3.0.2",
->>>>>>> master
     "sinon": "^9.2.4",
     "source-map-support": "^0.5.19",
     "superagent": "^6.1.0",