diff --git a/libs/types/src/event.ts b/libs/types/src/event.ts
index 8dfb5a15..1d1afb47 100644
--- a/libs/types/src/event.ts
+++ b/libs/types/src/event.ts
@@ -75,6 +75,8 @@ export type EventType =
   | 'merge:success'
   | 'merge:conflict'
   | 'merge:error'
+  | 'conflict:aborted'
+  | 'conflict:resolved'
   | 'branchCommitLog:start'
   | 'branchCommitLog:progress'
   | 'branchCommitLog:done'