Saving the status, after working for a while with Dropbox off, Dropbox created a bunch of conflicted copy files.  I will attempt automatic cleanup of these files but I am saving everything before just in case I delete something by mistake.
Solved all the dropbox conflicts and successfully kept the latest version of everythin (I think)