diff --git a/extensions/merge-conflict/package.json b/extensions/merge-conflict/package.json
index 708166d4508..ab645a38f22 100644
--- a/extensions/merge-conflict/package.json
+++ b/extensions/merge-conflict/package.json
@@ -14,7 +14,7 @@
     "Other"
   ],
   "activationEvents": [
-    "*"
+    "onStartupFinished"
   ],
   "main": "./out/mergeConflictMain",
   "browser": "./dist/browser/mergeConflictMain",