           options.doNotReparse = true
           @navModel.set 'body', @_serializeNavModel(), options
 
+      @tocNodes.on 'add', (model, collection, options) =>
+        if not options.doNotReparse
+          # Keep track of local changes if there is a remote conflict
+          @_localNavAdded[model.id] = model
+
+
       @tocNodes.on 'tree:add',    (model, collection, options) => @tocNodes.add model, options
       @tocNodes.on 'tree:remove', (model, collection, options) => @tocNodes.remove model, options
 

        # then remember it.
        if 'nav' == $item.attr('properties')
          @navModel = model

      # Add all the models in one batch so views do not re-sort on every add.
      allContent.add @manifest.models, {loading:true}


      # Push it to the set of items that were added since last save.
      # This is useful when the OPF file was remotely updated
      @_localAddedItems[model.id] = model


    _loadComplex: (fetchPromise) ->
