A couple of days ago Dropbox updated itself by moving my Dropbox files to ~/Library/CloudStorage/Dropbox. Ever since then, I'm seeing all kinds of duplicate folders that have "conflicted copy" in the file name. This wasn't happening prior to this change. Before this, everything was running smoothly and my Dropbox files were always being synced across my two computers.
What's going on here? It seems like Dropbox has broken my file system and I'm unsure of which copy of each folder I should be saving, the original or conflicted copy. What do we do?