starting to finish up the backup manager
resolving conflict