Reconcile syncs

So I have two versions of a synced folder, I can’t figure out how to reconcile them.

Here’s how it happened:

  • I’ve got two accounts synced via insync, I’ll call them Work and Home.
  • A few months ago, I started having errors with Work. Insync support suggested I upgrade to version 3.0.
  • When I upgraded, it seemed that for both accounts, the settings I’d previously used were being reapplied. But I then started having new problems with Work (Home seemed fine), eventually a new build of 3.0 corrected the problems I was having there.
  • Then, I discovered that Home was not syncing to the original location on my hard drive, but to the Insync default location on my hard drive. I’ve made changes to files on Home via both my laptop sync as well as directly on GDrive.

So, how do I reconcile the two versions of my sync’d drive?