adding command to backup db
resolving conflicts