diff --git a/package.json b/package.json
index 037121f42..473c69423 100644
--- a/package.json
+++ b/package.json
@@ -103,13 +103,8 @@
     "open-on-github": "0.38.0",
     "package-generator": "0.40.0",
     "release-notes": "0.53.0",
-<<<<<<< HEAD
-    "settings-view": "0.230.0",
-    "snippets": "0.101.0",
-=======
     "settings-view": "0.230.1",
-    "snippets": "0.100.0",
->>>>>>> origin/master
+    "snippets": "0.101.0",
     "spell-check": "0.61.0",
     "status-bar": "0.79.0",
     "styleguide": "0.44.0",