I just upgraded freebsd to 7.1 release and I think I messed up using mergemaster because I lost my users, I backed up /etc before I buildworld. Is there a way to recover this now?