Best bet is to use something like Beyond Compare merging any changes you had previously made then ftp all files (except those that should not be uploaded) then run the upgrade script.