What are you doing to sync your files? I'm current using the git integration and while it works it's a bit too manual for my tastes. I think I'm ok with last write wins as long as the sync stores history. The whole commiting changes, pushing, pulling, dealing with merge conflicts is a bit too much workflow for my notes.