Did not get what exactly did you mean by conflicted catalog?
If the conflicted catalog ( that you created on trip) has a different name than your original catalog, then yes you will have to recreate the smart previews because smart previews are specific for each catalog.
Let us know if you need any further assistance.
If you do this dropbox method, and you open one catalog while its still open on another computer, you get a double (conflicted) catalog. So if I just change the name it will connect? Better yet could I move my original for safe keeping, and simply change the name of the new catalog to the name of the old, which would be the same as the preview files? Thanks!
It depends on the process of creation of smart previews for the older catalog.
You can give that a try by moving the older catalog and renaming the new one to the new catalog name but that might or might not work.
The best way would be to recreate the smart previews for the new catalog and get rid of the older ones if they are not required.
Renaming it worked. I didn't want to recreate smart previews as that would take hours and hours to create and upload to dropbox. Thanks for the tips.
Great to know that worked for you.