     serialize: () ->
       serializer.serializeToString(@$xml[0])
 
-    resolveSaveConflict: () ->
+    # Resolves conflicts between changes to this model and the remotely-changed
+    # new attributes on this model.
+    onReloaded: () ->
       @_addItem(model, {}, false) for model in _.values(@_addedItems)
 
     onSaved: () ->

  'cs!gh-book/utils'
], (Backbone, mediaTypes, allContent, loadable, XhtmlFile, TocNode, TocPointerNode, Utils) ->

  class PackageFile extends TocNode
    serializer = new XMLSerializer()

    mediaType: 'application/oebps-package+xml'

          collection: @getChildren()
          model: @
        callback(view)
