diff --git a/src/editor.coffee b/src/editor.coffee
index 9ccce8149..ef128bfcd 100644
--- a/src/editor.coffee
+++ b/src/editor.coffee
@@ -309,6 +309,9 @@ class Editor extends Model
   onDidStopChanging: (callback) ->
     @getBuffer().onDidStopChanging(callback)
 
+  onDidConflict: (callback) ->
+    @getBuffer().onDidConflict(callback)
+
   # Retrieves the current {TextBuffer}.
   getBuffer: -> @buffer