                 callback new Error "Can't resolve this conflict!"
             else if file
                 doc._rev = file._rev
+                doc.tags ?= file.tags or []
                 doc.remote ?= file.remote
                 doc.creationDate ?= file.creationDate
                 if @sameBinary file, doc

                doc.size         ?= was.size
                doc.class        ?= was.class
                doc.mime         ?= was.mime
                was.moveTo        = doc._id
                was._deleted      = true
                if file and @sameFile file, doc

                else
                    @pouch.db.put doc, callback
            else
                doc.tags ?= []
                doc.creationDate ?= new Date
                @ensureParentExist side, doc, =>
                    @pouch.db.put doc, callback
