     @fileSubscriptions = new CompositeDisposable
 
     @fileSubscriptions.add @file.onDidChange =>
-      @conflict = true if @isModified()
-      previousContents = @cachedDiskContents
-
-      # Synchrounously update the disk contents because the {File} has already cached them. If the
-      # contents updated asynchrounously multiple `conlict` events could trigger for the same disk
-      # contents.
-      @updateCachedDiskContentsSync()
-      return if previousContents == @cachedDiskContents
-
-      if @conflict
-        @emitter.emit 'did-conflict'
-        @emit "contents-conflicted"
-      else
-        @reload()
+      @onDidFileChange()
 
     @fileSubscriptions.add @file.onDidDelete =>
       modified = @getText() != @cachedDiskContents

    @fileSubscriptions.add @file.onDidRename =>
      @emitter.emit 'did-change-path', @getPath()
      @emit "path-changed", this

  # Identifies if the buffer belongs to multiple editors.
  #

  # Public: Sets the encoding for this buffer.
  #
  # * `encoding` The {String} encoding to use such as 'utf8'
  setEncoding: (@encoding) ->
    if @file?
      @file.setEncoding(@encoding)
      @updateCachedDiskContents true, => @onDidFileChange()

  # Public: Returns the {String} encoding of this buffer.
  getEncoding: -> @encoding ? @file.getEncoding()
