It's amazing how our hindsight is so clear, lets pat ourselves on the back!

I used to use dropbox, but after running in on a bunch of devices and having to learn the quirks of each implementation and its sync hassles I left it. SFTP is simple, free, ubiquitous, and the words 'conflict resolution' never come up when I use it.