commiting files with changed inode numbers
managing models with multiple databases
commiting files with changed inode numbers
adding setting for a parallel users database
resolving conflicts after merge