How do you handle syncing in orgzly? My current approach is "remember to hit the sync button", but apparently I suck at that. :) At least it's easy to fix sync conflicts in Emacs using ediff.