You can just sync. Changes from each side will be uploaded and applied to the other side. If you've made conflicting changes to the same items, you'll get a conflict-resolution dialog for those items.
For good measure, make a backup copy of your Zotero data directory on each computer before doing this.
Upgrade Storage
For good measure, make a backup copy of your Zotero data directory on each computer before doing this.