                     isRootFolderAdded = currentFileIdentifier == rootFolderID
                     if let remoteFile = remoteFilesDict[currentFileIdentifier]
                     {
-                        dbFile.value = mergeYSFiles(dbFile: &dbFile.value, remoteFile: remoteFile, folder: folder)
+                        dbFile.value = mergeFiles(dbFile: &dbFile.value, remoteFile: remoteFile, folder: folder)
                     }
                     else
                     {

                    //map ysfiledict to remote property names
                    let fileIdentifier = remoteFile["id"] as! String
                    var emptyFile = [String : Any]()
                    let mergedFile = mergeYSFiles(dbFile: &emptyFile, remoteFile: remoteFile, folder: folder)
                    remoteFilesDict[fileIdentifier] = mergedFile
                }
                for var dbFile in dbFilesArrayDict

        }
    }
    
    class func mapFiles(dbFile: inout [String: Any], remoteFile:[String: Any], folder : YSFolder) -> [String: Any]
    {
        var dbFile = dbFile
        dbFile["fileDriveIdentifier"] = remoteFile["id"]
