I had problems with conflicting files in dropbox / google drive so I just have a single directory with all of my org files in it versioned with a private Github repo.

For private stuff I just use the :crypt: keyword org extension to encrypt that entry with my GPG key...